From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6527286083495919616 X-Received: by 10.25.239.28 with SMTP id n28mr2118432lfh.34.1520584218382; Fri, 09 Mar 2018 00:30:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.62.8 with SMTP id l8ls738065lja.15.gmail; Fri, 09 Mar 2018 00:30:17 -0800 (PST) X-Google-Smtp-Source: AG47ELsHh9PNcr0uedVBoexyoh9J3koGD6wERg5debD1bErOTjhLIT0wj0rzYH9110vCxpFRdbzz X-Received: by 10.46.112.8 with SMTP id l8mr1943948ljc.15.1520584217747; Fri, 09 Mar 2018 00:30:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520584217; cv=none; d=google.com; s=arc-20160816; b=hPn6L4Ah9uaAhuTnk2SUStXmrdPaNl5CflSFtfTabdMylYLD19cGvPaqRk/fhseEz7 ANwbqak8QSUaSbahUa/QTeIGWyXSsRZtlwhX1pU3xg0cgJtwAJne+ockTrsKQGEQryJm a5fSNlA2b82Xgy2o7/if5tg8/dnU5AX2Trw0moyvQOSUyJpQD6vuKkNHs+fnPwi1mhZ4 pVczV2yShw5CEOemp2cWDT4FhY3g1m0mA3PKpIncLotPKMh22bdyb8tiMhaDzDgB9c/c CXvE2y/EVZS4vkY5EfTgFKV8WauqudsPNj1Dsqzot85tyCW5ZdJYob71rCc3+KljP1S9 o+bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:to:from:date:arc-authentication-results; bh=SAhRJ/E5/mfmCb1t8YkIAGMbmfqwS9klF8jExHVA4LM=; b=MYBZYHX15G5Fqnn7CEy61lggJL8jKocdX7KKp5eHHipIMucmVCSGGdBF4c0msPqUxx SO9tb2Ky27f7mNBWdhSiTXapyHKAMGAdfK102LhhhQMjzTIoNp3Cy2b9fUJCeJbd1htN rDoZW7/ovHGKhrlinAYl9vvNm4MEjYW0quamXP46vSHFFmjfFgKxgGAaVqr0HhSQ/qz6 /Xh4hTI433chPMcy7knRWI+DZ4ZLusGfDGCdsJ2xjTrOjCZMhal1yzU13eF5iM6eX3KL END8U/ryxm3bg10ovg0/Wu8Wvv3MBbHgyG0HoL86VmEHJAi3A0uYICOBoUlkbKtG6Cjg SVMA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id v6si21066ljc.0.2018.03.09.00.30.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Mar 2018 00:30:17 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w298UGMb007320 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 9 Mar 2018 09:30:17 +0100 Received: from mmd1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w298UGL4027487 for ; Fri, 9 Mar 2018 09:30:16 +0100 Date: Fri, 9 Mar 2018 09:30:15 +0100 From: Henning Schild To: isar-users Subject: Re: [PATCH 1/2] meta: image: detect broken symlinks Message-ID: <20180309093015.7187db6c@mmd1pvb1c.ad001.siemens.net> In-Reply-To: <20180309082128.11093-1-henning.schild@siemens.com> References: <20180309082128.11093-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: VakZcIjSWqyn Still wrong ... ignore that one. Henning Am Fri, 9 Mar 2018 09:21:27 +0100 schrieb Henning Schild : > Switch get_image_name from os.path.lexists to os.path.exists because > the latter detects broken symlinks correctly. Also support older > debian versions where the symlinks in the rootfs are absolute > Also change scripts/start_vm to handle the case where no initrd is > present. > > Issue: > If you build a kernel without CONFIG_BLK_DEV_INITRD the postinst hook > will still call "linux-update-symlinks" and create a broken symlink. > After that os.path.lexists will return True and "sudo cp" in > do_copy_boot_files will fail. > > Signed-off-by: Henning Schild > --- > meta/classes/image.bbclass | 4 +++- > scripts/start_vm | 11 +++++++---- > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 2c255f4..6753aed 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -8,8 +8,10 @@ IMAGE_ROOTFS = "${WORKDIR}/rootfs" > def get_image_name(d, name_link): > S = d.getVar("IMAGE_ROOTFS", True) > path_link = os.path.join(S, name_link) > - if os.path.lexists(path_link): > + if os.path.exists(path_link): > return os.path.basename(os.path.realpath(path_link)) > + if os.path.islink(path_link): > + return os.path.basename(os.path.join(S, > os.path.realpath(path_link))) return "" > > # These variables are used by wic and start_vm > diff --git a/scripts/start_vm b/scripts/start_vm > index b7b5e17..0d1d554 100755 > --- a/scripts/start_vm > +++ b/scripts/start_vm > @@ -25,8 +25,8 @@ qemu-system-$QEMU_ARCH \\\\\n\ > -M $QEMU_MACHINE \\\\\n\ > $QCPU\\\\\n\ > -nographic \\\\\n\ > - -kernel \$IMAGE_DIR/$KERNEL_IMAGE \\\\\n\ > - -initrd \$IMAGE_DIR/$INITRD_IMAGE \\\\\n\ > + -kernel \$QKERNEL \\\\\n\ > + -initrd \$QINITRD \\\\\n\ > -append \"console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw\" > \\\\\n\ $EXTRA_ARGS \\\\\n\ > $root1" > @@ -38,8 +38,8 @@ qemu-system-$QEMU_ARCH \\\\\n\ > -M $QEMU_MACHINE \ > $QCPU \ > -nographic \ > - -kernel $IMAGE_DIR/$KERNEL_IMAGE \ > - -initrd $IMAGE_DIR/$INITRD_IMAGE \ > + -kernel $QKERNEL \ > + -initrd $QINITRD \ > -append "console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw" \ > $EXTRA_ARGS \ > $root2 > @@ -118,6 +118,9 @@ readonly > ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img > eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | > grep "^KERNEL_IMAGE=") eval $(bitbake -e > multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep > "^INITRD_IMAGE=") +QKERNEL=$IMAGE_DIR/$KERNEL_IMAGE +QINITRD=/dev/null > +[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/$INITRD_IMAGE > > readonly ISARROOT="$(dirname "$0")"/.. >