Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=073e34d3df7d280a0831dca09c85e90083d6781e
commit 073e34d3df7d280a0831dca09c85e90083d6781e Author: Miklos Vajna <[email protected]> Date: Mon Dec 26 20:43:20 2011 +0100 fix non-interactive build we already have a config where questions should be answered ;) diff --git a/bin/create-iso b/bin/create-iso index b0571b5..f09ba2d 100755 --- a/bin/create-iso +++ b/bin/create-iso @@ -1,7 +1,6 @@ #!/bin/bash -xe . $PWD/config -. $PWD/config.tmp rm -rf $TREE/iso mkdir -p $TREE/iso/boot/syslinux diff --git a/bin/create-rootfs b/bin/create-rootfs index 2f08d5e..8197164 100755 --- a/bin/create-rootfs +++ b/bin/create-rootfs @@ -79,22 +79,15 @@ EOF echo "[eth0]" >$CHROOTDIR/etc/sysconfig/network/default echo "options = dhcp" >>$CHROOTDIR/etc/sysconfig/network/default -## For x86_64 ask question for what ARCH to build iso -if [ $ARCH == "x86_64" ]; then - echo "Do you want Fwlive for i686 or x86_64 ? ( default : x86_64 )" - read archbuild - case $archbuild in - i686|I686) - ARCH="i686" - EXTRAOPTS="--noarch" - echo "ARCHBUILD=i686" > config.tmp ;; - *) - ARCH="x86_64" - echo "ARCHBUILD=x86_64" > config.tmp ;; - esac -else - echo "ARCHBUILD=i686" > config.tmp -fi +case $ARCHBUILD in + i686|I686) + ARCH="i686" + EXTRAOPTS="--noarch" + ;; + *) + ARCH="x86_64" + ;; +esac # Build it echo "Building chroot environment" if [ -e pacman-g2.conf ]; then diff --git a/config.dev b/config.dev index 5e925d5..0c95104 100644 --- a/config.dev +++ b/config.dev @@ -55,6 +55,9 @@ USERNAME="fwlive" # Normal user password USERPASS="fwlive" +# Host architecure (in autoconf terms): building an i686 livecd on x86_64 is supported +ARCHBUILD="$(uname -m)" + # Additional packages to be installed by the profiles INST_MIN_APPS="base memtest86+ openssh ntfs-3g testdisk net-tools partimage zd1211-firmware bluez-firmware b43-fwcutter" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
