Permalink
Browse files

Merge branch 'master' of git://github.com/pcbsd/pcbsd

  • Loading branch information...
2 parents cc49825 + 25f74f0 commit 2e3e639e235230e25ebd54d15092e6032878916f JoshDW19 committed Mar 13, 2014
Showing 379 changed files with 13,575 additions and 9,209 deletions.
@@ -63,7 +63,7 @@ if [ -e "/usr/pcbsd-live" ]; then
if [ "$FOUND" = "0" ]
then
/root/PCBSDtext.sh
- shutdown -r now
+ reboot -q
exit
fi
@@ -94,7 +94,7 @@ mkdir /tmp/xkb
kenv xconsole 2>/dev/null | grep -q "YES"
if [ $? -eq 0 ]; then
/root/PCBSDtext.sh
- shutdown -r now
+ reboot -q
exit
fi
@@ -105,12 +105,12 @@ start_xorg
if [ -e "/root/.exitStatus" ] ; then
STATUS="`cat /root/.exitStatus`"
if [ "$STATUS" = "0" ] ; then
- shutdown -r now
+ reboot -q
else
echo "Installation failed! Press any key to drop to shell or type 'reboot' to restart the system"
read tmp
if [ "$tmp" = "reboot" ] ; then
- shutdown -r now
+ reboot -q
else
/bin/sh
fi
@@ -26,7 +26,7 @@ case $ANS in
startx 2>/tmp/Xerrors ;;
utility) /root/PCBSDUtil.sh
clear ;;
- reboot) shutdown -r now ;;
+ reboot) reboot -q ;;
*) ;;
esac
Oops, something went wrong.

0 comments on commit 2e3e639

Please sign in to comment.