oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't make /CD on usb stick

Browse Source 
Don't demand /CD at setup time
This commit is contained in:
Ben Gras 2006-05-02 12:50:01 +00:00
parent 242606eda9
commit d9d8b94602
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands/scripts/setup.sh
View File

@ -93,11 +93,6 @@ warn()
while getopts '' opt; do usage; done while getopts '' opt; do usage; done
shift `expr $OPTIND - 1` 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 ] if [ "$USER" != root ]
then echo "Please run setup as root." then echo "Please run setup as root."
exit 1 exit 1

7
tools/release.sh
View File

@ -64,7 +64,6 @@ usb_root_changes()
$RELEASEDIR/usr/mdec/bootblock boot/boot $RELEASEDIR/usr/mdec/bootblock boot/boot
echo \ echo \
'bios_wini=yes 'bios_wini=yes
disable=inet
bios_remap_first=1 bios_remap_first=1
rootdev=c0d7p0s0 rootdev=c0d7p0s0
save' | $RELEASEDIR/usr/bin/edparams $TMPDISK3 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 # Bug tracking system not for on cd
rm -rf $RELEASEDIR/usr/src/doc/bugs rm -rf $RELEASEDIR/usr/src/doc/bugs
# Make sure the CD knows it's a CD # Make sure the CD knows it's a CD, unless it's not
date >$RELEASEDIR/CD if [ "$USB" -eq 0 ]
then date >$RELEASEDIR/CD
fi
echo " * Chroot build" echo " * Chroot build"
chroot $RELEASEDIR "/bin/sh -x /usr/src/tools/chrootmake.sh" || exit 1 chroot $RELEASEDIR "/bin/sh -x /usr/src/tools/chrootmake.sh" || exit 1
echo " * Chroot build done" echo " * Chroot build done"