Don't make /CD on usb stick

Don't demand /CD at setup time

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index b2b1ebf9304c3527784e904afbc2dac909b9fb9d..03d3f796cfbb95ea02fa85c6ad025605774e255a 100755 (executable)
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -93,11 +93,6 @@ warn()
 while getopts '' opt; do usage; done
 shift `expr $OPTIND - 1`
 
-if [ ! -f /CD ]
-then   echo "Please run setup from the CD, not from a live system."
-       exit 1
-fi
-
 if [ "$USER" != root ]
 then   echo "Please run setup as root."
        exit 1

diff --git a/tools/release.sh b/tools/release.sh
index 6a4018e868ae89ce4857412ffb8e6a5cb5c81a2f..7c4706f2fb89648b948d47ab02d52cc84d7612d3 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -64,7 +64,6 @@ usb_root_changes()
                $RELEASEDIR/usr/mdec/bootblock boot/boot
        echo \
 'bios_wini=yes
-disable=inet
 bios_remap_first=1
 rootdev=c0d7p0s0
 save'  | $RELEASEDIR/usr/bin/edparams $TMPDISK3
@@ -304,8 +303,10 @@ find $RELEASEDIR/usr/src/commands -name build | xargs chmod 755
 # Bug tracking system not for on cd
 rm -rf $RELEASEDIR/usr/src/doc/bugs
 
-# Make sure the CD knows it's a CD
-date >$RELEASEDIR/CD
+# Make sure the CD knows it's a CD, unless it's not
+if [ "$USB" -eq 0 ]
+then   date >$RELEASEDIR/CD
+fi
 echo " * Chroot build"
 chroot $RELEASEDIR "/bin/sh -x /usr/src/tools/chrootmake.sh" || exit 1
 echo " * Chroot build done"