livecd: functions-live, installer/installer.sh - move installer fu...

[havner]

Author: havner                       Date: Thu Jan 26 19:49:31 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- move installer functions back to installer

---- Files affected:
livecd:
   functions-live (1.6 -> 1.7) 
livecd/installer:
   installer.sh (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: livecd/functions-live
diff -u livecd/functions-live:1.6 livecd/functions-live:1.7
--- livecd/functions-live:1.6	Tue Jan  4 02:03:19 2005
+++ livecd/functions-live	Thu Jan 26 20:49:26 2006
@@ -86,78 +86,6 @@
 	return 0
 }
 
-# give it $npart, it will return $gpart
-normal_to_grub() {
-        GROOT=`echo $npart| awk '{sub(/^hd|^sd|^c[0-9]d/,"");print $0}'`
-        if echo $GROOT | grep -q '^[0-9][0-9]*$' ; then
-                DRIVE=$GROOT
-        else
-                DRIVE=`echo $GROOT| awk '{sub(/p?[0-9]*$/,"");print $0}'`
-        fi
-        NR=`echo $GROOT| awk '{sub(/^([a-z]*|[0-9]*p?)/,"");print $0}'`
-        NDRIVE=""
-
-        if echo $DRIVE | grep -q '^[0-9][0-9]*$' ; then
-                NDRIVE=$DRIVE
-        else
-                TR=`echo $DRIVE |tr "a-j" "0-9"`
-                [ "${DRIVE}" != "$TR" ] && NDRIVE="$TR"
-                TR=`echo $DRIVE |tr "k-u" "0-9"`
-                [ "${DRIVE}" != "$TR" ] && NDRIVE="1${TR}"
-                TR=`echo $DRIVE |tr "w-z" "0-3"`
-                [ "${DRIVE}" != "$TR" ] && NDRIVE="2${TR}"
-        fi
-
-        if [ "${NR}" != "" ]; then
-                NR=`expr $NR - 1`
-                gpart="(hd${NDRIVE},$NR)"
-        else
-                gpart="(hd${NDRIVE})"
-        fi
-        unset TR NR NDRIVE GROOT DRIVE
-}
-
-# give it $npart, it will return $devpart
-normal_to_dev() {
-	devpart=`ls -l /dev/$npart | awk '{gsub(/,/,"",$5); printf "%0+2x%0+2x", $5, $6}'`
-}
-
-# Routine replacing 'hda1' with something nicer as 'First partition of first IDE disk'
-identify_disk()
-{
-	case `echo $cp | cut -b 1` in
-		h) bus=IDE;;
-		s) bus=SCSI;;
-	esac 
-	case `echo $cp | cut -b 3` in
-		a) busn=first;;
-		b) busn=second;;
-		c) busn=third;;
-		d) busn=fourth;;
-		e) busn=fifth;;
-		f) busn=sixth;;
-		g) busn=seventh;;
-		h) busn=eighth;;
-		i) busn=nineth;;
-		j) busn=tenth;;
-		k) busn=eleventh;;
-	esac
-	case `echo $cp | cut -b 4-` in
-		1) partn=First;;
-		2) partn=Second;;
-		3) partn=Third;;
-		4) partn=Fourth;;
-		5) partn=Fifth;;
-		6) partn=Sixth;;
-		7) partn=Seventh;;
-		8) partn=Eighth;;
-		9) partn=Nineth;;
-		10) partn=Tenth;;
-		11) partn=Eleventh;;
-	esac
-	partid="$partn partition of $busn $bus disk ($cp)"
-}
-
 get_parts_linux() {
 	sfdisk -l  | grep "Linux$" | awk '{print $1}' | awk -F"/" '{print $3}'
 }

================================================================
Index: livecd/installer/installer.sh
diff -u livecd/installer/installer.sh:1.113 livecd/installer/installer.sh:1.114
--- livecd/installer/installer.sh:1.113	Sun Aug 22 02:38:23 2004
+++ livecd/installer/installer.sh	Thu Jan 26 20:49:26 2006
@@ -8,6 +8,78 @@
 LIVECD_TOP="PLD LiveCD $LIVECD_VERSION $INSTALLER_ID"
 LIVECD_BANNER="PLD LiveCD Installer"
 
+# give it $npart, it will return $gpart
+normal_to_grub() {
+        GROOT=`echo $npart| awk '{sub(/^hd|^sd|^c[0-9]d/,"");print $0}'`
+        if echo $GROOT | grep -q '^[0-9][0-9]*$' ; then
+                DRIVE=$GROOT
+        else
+                DRIVE=`echo $GROOT| awk '{sub(/p?[0-9]*$/,"");print $0}'`
+        fi
+        NR=`echo $GROOT| awk '{sub(/^([a-z]*|[0-9]*p?)/,"");print $0}'`
+        NDRIVE=""
+
+        if echo $DRIVE | grep -q '^[0-9][0-9]*$' ; then
+                NDRIVE=$DRIVE
+        else
+                TR=`echo $DRIVE |tr "a-j" "0-9"`
+                [ "${DRIVE}" != "$TR" ] && NDRIVE="$TR"
+                TR=`echo $DRIVE |tr "k-u" "0-9"`
+                [ "${DRIVE}" != "$TR" ] && NDRIVE="1${TR}"
+                TR=`echo $DRIVE |tr "w-z" "0-3"`
+                [ "${DRIVE}" != "$TR" ] && NDRIVE="2${TR}"
+        fi
+
+        if [ "${NR}" != "" ]; then
+                NR=`expr $NR - 1`
+                gpart="(hd${NDRIVE},$NR)"
+        else
+                gpart="(hd${NDRIVE})"
+        fi
+        unset TR NR NDRIVE GROOT DRIVE
+}
+
+# give it $npart, it will return $devpart
+normal_to_dev() {
+	devpart=`ls -l /dev/$npart | awk '{gsub(/,/,"",$5); printf "%0+2x%0+2x", $5, $6}'`
+}
+
+# Routine replacing 'hda1' with something nicer as 'First partition of first IDE disk'
+identify_disk()
+{
+	case `echo $cp | cut -b 1` in
+		h) bus=IDE;;
+		s) bus=SCSI;;
+	esac 
+	case `echo $cp | cut -b 3` in
+		a) busn=first;;
+		b) busn=second;;
+		c) busn=third;;
+		d) busn=fourth;;
+		e) busn=fifth;;
+		f) busn=sixth;;
+		g) busn=seventh;;
+		h) busn=eighth;;
+		i) busn=nineth;;
+		j) busn=tenth;;
+		k) busn=eleventh;;
+	esac
+	case `echo $cp | cut -b 4-` in
+		1) partn=First;;
+		2) partn=Second;;
+		3) partn=Third;;
+		4) partn=Fourth;;
+		5) partn=Fifth;;
+		6) partn=Sixth;;
+		7) partn=Seventh;;
+		8) partn=Eighth;;
+		9) partn=Nineth;;
+		10) partn=Tenth;;
+		11) partn=Eleventh;;
+	esac
+	partid="$partn partition of $busn $bus disk ($cp)"
+}
+
 MENU_MAIN() {
 	res=`dml -t "$LIVECD_TOP" << _EOF
 	<br>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/functions-live?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/livecd/installer/installer.sh?r1=1.113&r2=1.114&f=u