From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6527637623433854976 X-Received: by 10.28.170.145 with SMTP id t139mr155516wme.2.1519993666142; Fri, 02 Mar 2018 04:27:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.163.205 with SMTP id m13ls2761521wrb.0.gmail; Fri, 02 Mar 2018 04:27:45 -0800 (PST) X-Google-Smtp-Source: AG47ELt5kYXivS6yc9jZnndo5QWQ1g85KRwGOjxJk6dzrgq4KEdjr1eFQtmXKF6Rzr/Fd8r7l22B X-Received: by 10.223.163.221 with SMTP id m29mr563246wrb.20.1519993665517; Fri, 02 Mar 2018 04:27:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519993665; cv=none; d=google.com; s=arc-20160816; b=QBPG7b45Oz8vR/EWJ22Hf/wTbPchkJrAVWAvuZA8mQq9Ww76bIOUVMlFKUzq+8+5Ua 9WzH+6/oiyx9qls5sT9iNGwGIfrB3NE7suDprZnMQO+Z5WpcIlgz2BX/BO8t+yEtqLgA BZ/yWT/D74T6smW04KQLqiobaNC3S40MmDdgW3iCzo7Ig+861Xwh9yoE5+nk7h0N5gjq p+D5xL4CndXLPwJSCzl92RjneDg75hDzp5kVu3/h2gtgpVdj+WgeyUEox3+EPyHUI3Ta ur5W02BEw+V0gZ1ok7RxUHktPxAKLHHIbLN0JqdaZe4PSsZMZQ325Ue7Z9AnNvx8zi2t TeEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :arc-authentication-results; bh=gNUeWawLHWZIpYjlgY8jHVBDzeSgS6gFGAZSIgbS7zs=; b=smKgyYLZllg1EnxcBguQmMsIANYMeX2mTWp3RDYi1j6Qmbl+tqGcT2OU0yo6mTeJcQ qO4HuzMrLpKHKhhv+7ruS2vXTzQ18AA9e6ayzg0vVNu1UH6B4P/OS4myyoDilmK9xaRb 4myKc7NQtl6Fiq8qIya3FgsT8oIKuvNeVssc9DJnwUU8iJVSWbsPMetDRAjnqNcRWILU LdXz6tHpnWVWMl6EeZfsEa6uyztC9Es4TdCCfIEEsfKNlCrAIhdWI3kydVoP63AdnvOv F7JRXhbgxH9Pq+UZQ4xaXf3UnHB1QxBDa/LdcZ6gkYAH29RF7+xnRqp9RdIJmcd+NHaG RIXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 51si415641wrw.0.2018.03.02.04.27.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Mar 2018 04:27:45 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w22CRiuB011885 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 2 Mar 2018 13:27:45 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w22CRiiC029492; Fri, 2 Mar 2018 13:27:44 +0100 Subject: Re: [PATCH] images: base-image: pass ROOTFS_TYPE to fstab generator in configscript To: "[ext] Henning Schild" , isar-users@googlegroups.com References: <20180228160746.5528-1-henning.schild@siemens.com> From: Jan Kiszka Message-ID: Date: Fri, 2 Mar 2018 13:27:44 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20180228160746.5528-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: W/arFAvo8rbt On 2018-02-28 17:07, [ext] Henning Schild wrote: > When not using ext4-img the hardcoded /etc/fstab is actually wrong. To > allow poeple to implement their own imager classes, allow to control the > type. > > Signed-off-by: Henning Schild > --- > meta-isar/recipes-core/images/files/debian-configscript.sh | 3 ++- > meta-isar/recipes-core/images/files/raspbian-configscript.sh | 3 ++- > meta-isar/recipes-core/images/isar-image-base.bb | 4 ++-- > meta/classes/ext4-img.bbclass | 2 ++ > 4 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh > index 33b2b53..f2fa2d9 100755 > --- a/meta-isar/recipes-core/images/files/debian-configscript.sh > +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh > @@ -8,6 +8,7 @@ set -e > readonly MACHINE_SERIAL="$1" > readonly BAUDRATE_TTY="$2" > readonly ROOTFS_DEV="$3" > +readonly ROOTFS_TYPE="$4" > > cat >> /etc/default/locale << EOF > LANG=en_US.UTF-8 > @@ -51,7 +52,7 @@ grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd > > cat > /etc/fstab << EOF > # Begin /etc/fstab > -/dev/$ROOTFS_DEV / ext4 defaults 1 1 > +/dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 > proc /proc proc nosuid,noexec,nodev 0 0 > sysfs /sys sysfs nosuid,noexec,nodev 0 0 > devpts /dev/pts devpts gid=5,mode=620 0 0 > diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh > index 4cb004b..1a85c40 100644 > --- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh > +++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh > @@ -8,6 +8,7 @@ set -e > readonly MACHINE_SERIAL="$1" > readonly BAUDRATE_TTY="$2" > readonly ROOTFS_DEV="$3" > +readonly ROOTFS_TYPE="$4" > > cat >> /etc/default/locale << EOF > LANG=en_US.UTF-8 > @@ -55,7 +56,7 @@ grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd > > cat > /etc/fstab << EOF > # Begin /etc/fstab > -/dev/$ROOTFS_DEV / ext4 defaults 1 1 > +/dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 > proc /proc proc nosuid,noexec,nodev 0 0 > sysfs /sys sysfs nosuid,noexec,nodev 0 0 > devpts /dev/pts devpts gid=5,mode=620 0 0 > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb > index b444258..80cb666 100644 > --- a/meta-isar/recipes-core/images/isar-image-base.bb > +++ b/meta-isar/recipes-core/images/isar-image-base.bb > @@ -69,8 +69,8 @@ do_rootfs() { > sudo -E multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f "${WORKDIR}/multistrap.conf" > > # Configure root filesystem > - sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} ${BAUDRATE_TTY} \ > - ${ROOTFS_DEV} > + sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} \ > + ${BAUDRATE_TTY} ${ROOTFS_DEV} ${ROOTFS_TYPE} > sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" > > sudo umount ${IMAGE_ROOTFS}/proc 2>/dev/null || true > diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass > index 83cb137..8a978e6 100644 > --- a/meta/classes/ext4-img.bbclass > +++ b/meta/classes/ext4-img.bbclass > @@ -4,6 +4,8 @@ > # Extra space for rootfs in MB > ROOTFS_EXTRA ?= "64" > > +ROOTFS_TYPE = "ext4" > + > EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.ext4.img" > > do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" > Looks good. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux