X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from ncopa-desktop.alpinelinux.org (unknown [79.160.13.133]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by mail.alpinelinux.org (Postfix) with ESMTPSA id 47BD3DC0087; Tue, 4 Nov 2014 10:33:25 +0000 (UTC) Date: Tue, 4 Nov 2014 11:33:22 +0100 From: Natanael Copa To: Juan Francisco Cantero Hurtado Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH] Add btrfs-progs to init_progs(). Use "-q" only when the tool supports this switch. Message-ID: <20141104113322.7b294686@ncopa-desktop.alpinelinux.org> In-Reply-To: References: <1406853575-30650-1-git-send-email-iam@juanfra.info> <20140801112501.6463d227@ncopa-desktop.alpinelinux.org> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-alpine-linux-musl) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit This was finally applied. Sorry for the delay. Thanks! -nc On Sat, 02 Aug 2014 00:17:31 +0200 Juan Francisco Cantero Hurtado wrote: > On Friday 01 August 2014 11:25:01 you wrote: > > On Fri, 1 Aug 2014 02:39:35 +0200 > > Juan Francisco Cantero Hurtado wrote: > > > > So as i understand this adds support for btrfs to setup-disk? > > Yes. I tried to use ROOTFS=btrfs but failed because btrfs-progs > was not installed and the tools doesn't support "-q". > > > > > > --- > > > > > > setup-disk.in | 16 ++++++++++++---- > > > 1 file changed, 12 insertions(+), 4 deletions(-) > > > > > > diff --git a/setup-disk.in b/setup-disk.in > > > index c20c619..f41a464 100644 > > > --- a/setup-disk.in > > > +++ b/setup-disk.in > > > @@ -424,7 +424,7 @@ stop_all_raid() { > > > > > > init_progs() { > > > > > > local raidpkg= > > > [ -n "$USE_RAID" ] && raidpkg="mdadm" > > > > > > - apk add --quiet sfdisk e2fsprogs lvm2 $raidpkg syslinux $@ > > > + apk add --quiet sfdisk e2fsprogs lvm2 $raidpkg syslinux > > > btrfs-progs $@> > > > } > > > > If we are going to do this, how about soemthing like: > > > > case $ROOTFS in > > ext*) fstools=e2fsprogs; mkfs_args="-q";; > > xfs) fstools=xfsprogs; mkfs_args="-q";; > > btrfs) fstools=btrs-progs; mkfs_args="";; > > esac > > apk add --quiet $fstools .... > > > > That way we dont install btrfs-tools unless actually needed and we > > avoid specialhandling for future filesystems. > > > > > show_disk_info() { > > > > > > @@ -519,7 +519,11 @@ setup_boot_dev() { > > > > > > --metadata=0.90 --quiet --run $@ $missing || return 1 > > > > > > bootdev=/dev/md0 > > > > > > fi > > > > > > - mkfs.$BOOTFS -q $bootdev > > > + local mkfs_args= > > > + if [ "$BOOTFS" != "btrfs" ]; then > > > + mkfs_args="-q" > > > + fi > > > + mkfs.$BOOTFS $mkfs_args $bootdev > > > > > > BOOT_DEV="$bootdev" > > > > > > } > > > > btw.. does exlinux support booting from btrfs? > > I didn't test with BOOTFS. I only added that part because the wiki > says that BOOTFS supports also btrfs > http://wiki.alpinelinux.org/wiki/Alpine_setup_scripts#setup-disk . > > > > > > @@ -614,7 +618,7 @@ setup_var() { > > > > > > local var_dev="$1" > > > local varfs=${VARFS} > > > echo "Creating file systems..." > > > > > > - mkfs.$varfs -q $var_dev >/dev/null || return 1 > > > + mkfs.$varfs $var_dev >/dev/null || return 1 > > > > > > sed -i -e '/[[:space:]]\/var[[:space:]]/d' /etc/fstab > > > echo -e "${var_dev}\t/var\t\t${varfs}\tdefaults 1 2" >> /etc/fstab > > > > > > @@ -710,7 +714,11 @@ data_only_disk_install() { > > > > > > # setup > > > setup_root() { > > > > > > local root_dev="$1" boot_dev="$2" > > > > > > - mkfs.$ROOTFS -q "$root_dev" > > > + local mkfs_args= > > > + if [ "$ROOTFS" != "btrfs" ]; then > > > + mkfs_args="-q" > > > + fi > > > + mkfs.$ROOTFS $mkfs_args "$root_dev" > > > > > > mkdir -p "$SYSROOT" > > > mount -t $ROOTFS $root_dev "$SYSROOT" || return 1 > > > if [ -n "$boot_dev" ]; then > > > > -nc > > > From 87a2a3ca2f365df3c60d933b71d70333287e090f Mon Sep 17 00:00:00 2001 > From: Juan Francisco Cantero Hurtado > Date: Fri, 1 Aug 2014 23:47:50 +0200 > Subject: [PATCH] Add support for btrfs to setup-disk. > > --- > setup-disk.in | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/setup-disk.in b/setup-disk.in > index c20c619..bae373a 100644 > --- a/setup-disk.in > +++ b/setup-disk.in > @@ -424,7 +424,12 @@ stop_all_raid() { > init_progs() { > local raidpkg= > [ -n "$USE_RAID" ] && raidpkg="mdadm" > - apk add --quiet sfdisk e2fsprogs lvm2 $raidpkg syslinux $@ > + case $ROOTFS in > + ext*) fstools=e2fsprogs; mkfs_args="-q";; > + xfs) fstools=xfsprogs; mkfs_args="-q";; > + btrfs) fstools=btrs-progs; mkfs_args="";; > + esac > + apk add --quiet sfdisk e2fsprogs lvm2 $raidpkg syslinux $fstools $@ > } > > show_disk_info() { > @@ -614,7 +619,7 @@ setup_var() { > local var_dev="$1" > local varfs=${VARFS} > echo "Creating file systems..." > - mkfs.$varfs -q $var_dev >/dev/null || return 1 > + mkfs.$varfs $var_dev >/dev/null || return 1 > sed -i -e '/[[:space:]]\/var[[:space:]]/d' /etc/fstab > echo -e "${var_dev}\t/var\t\t${varfs}\tdefaults 1 2" >> /etc/fstab > > @@ -710,7 +715,7 @@ data_only_disk_install() { > # setup > setup_root() { > local root_dev="$1" boot_dev="$2" > - mkfs.$ROOTFS -q "$root_dev" > + mkfs.$ROOTFS $mkfs_args "$root_dev" > mkdir -p "$SYSROOT" > mount -t $ROOTFS $root_dev "$SYSROOT" || return 1 > if [ -n "$boot_dev" ]; then --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---