From d9d8b94602a5b4da94ddbd10921798d90b3d1fba Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Tue, 2 May 2006 12:50:01 +0000 Subject: [PATCH] Don't make /CD on usb stick Don't demand /CD at setup time --- commands/scripts/setup.sh | 5 ----- tools/release.sh | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh index b2b1ebf93..03d3f796c 100755 --- 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 6a4018e86..7c4706f2f 100755 --- 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" -- 2.44.0