[Lunar-commits] CVS: brutus/iso/usr/sbin lunar.install,1.13,1.14

[Terry Chan]

Update of /var/cvs/lunar/brutus/iso/usr/sbin
In directory dbguin.lunar-linux.org:/tmp/cvs-serv1692

Modified Files:
	lunar.install 
Log Message:
Updated this file to the Lunar-1.3.3 iso version.


Index: lunar.install
===================================================================
RCS file: /var/cvs/lunar/brutus/iso/usr/sbin/lunar.install,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- lunar.install	10 Dec 2003 16:34:34 -0000	1.13
+++ lunar.install	19 Jan 2004 05:01:04 -0000	1.14
@@ -48,6 +48,13 @@
 # Also added kernel modules to cdrom for test loading of
 # kernel modules straight from cdrom and not just initrd.
 #############################################################
+# 20031213, tchan fixed the use of --nocancel in dialog 
+# scripts as the latest dialog has now changed its behavior
+# Don't use nocancel in yesno boxes anymore!
+#############################################################
+# 20040109, tchan added the test for /usr/include/asm and
+# linux symlink removal
+#############################################################
 
 introduction()  {
 
@@ -109,7 +116,7 @@
     fi
 
   else
-    $DIALOG  $2  --nocancel  --yesno  "$1"  8 50
+    $DIALOG  $2  --yesno  "$1"  8 50
   fi
 
 }
@@ -447,7 +454,7 @@
 If you select NO, the filesystem will be mounted w/o being formatted.\n\n
 Do you want to execute the command below?\n"
 
-  if  $DIALOG  --nocancel --defaultno --yesno "$NOTICE \n $COMMAND" 11 65;  then
+  if  $DIALOG  --defaultno --yesno "$NOTICE \n $COMMAND" 11 65;  then
     if $PROG $FSTYPE $CHECK $FORCE $DEVICE;  then
       $DIALOG  --msgbox  "$SUCCESS"  9  50
     else
@@ -637,6 +644,14 @@
 
   if  confirm  "$PROMPT";  then
 
+    # remove the /usr/include/asm and /usr/include/linux symlinks
+    if [ -h $TARGET/usr/include/asm ] ; then
+      rm -f $TARGET/usr/include/asm
+    fi
+    if [ -h $TARGET/usr/include/linux ] ; then
+      rm -f $TARGET/usr/include/linux
+    fi
+    
     echo  "Installing Lunar Linux. This will take some time, especially on /usr"
     echo  " "   
     echo -n "Now transferring: " 
@@ -1322,6 +1337,8 @@
 main()  {
 
   export  PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin"
+  # setting this var is supposed to prevent the enviro_check code now!
+  export  LUNAR_INSTALL=1
 
         TARGET="/mnt/root"
        CONFIRM=on
@@ -1330,8 +1347,8 @@
 
   touch  "/mnt/read_write_check" 2>/dev/null  &&
   rm      /mnt/read_write_check               ||
-  mount  -t  tmpfs  tmpfs  /mnt
-  mount  -t  devfs  devfs  /dev
+  mount  -n -t  tmpfs  tmpfs  /mnt
+  mount  -n -t  devfs  devfs  /dev
   # added this code here to make /etc writable for supporting niki's LVM install
   #mkdir /mnt/etc
   #cp -aR /etc /mnt/etc
@@ -1350,7 +1367,7 @@
 "
 DIALOG="dialog
 --backtitle
-Lunar Linux Installer 20031210
+Lunar Linux Installer 20040109
 --stdout"
 ARCH=`arch`