Dimitar Zhekov <jimmy@is-vn.bg>:

LILO options, namely READONLY and XL_SECS. Intended primary
for bootdisks. The take the advantage of there, however,
the bootdisk target lilo must be used when making floppies
(included as makeimages -reroot option).


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1361 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -11,7 +11,8 @@
  - Clifford Wolf: fixed strace useage in Build-Pkg
  - fixed openldap to install the .init (#109)
  - Dimitar Zhekov: fixed mplayer doc copy, enabled mp3x in lame, fixed
-		   xfree86-doc, added xfce4 session manager, fixed cd ; echo
+		   xfree86-doc, added xfce4 session manager, fixed cd ; echo,
+                   added new lilo config options
 
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
 

package/x86/lilo/config.hlp

@@ -0,0 +1,14 @@
+MENU_PKG_LILO
+  Here you'll find options for LILO.
+
+ROCKCFG_PKG_LILO_READONLY
+  Don't write to disk while booting. Disallows overwriting the default
+  command line sector of the map file. Command lines set with -R stay in
+  effect until explicitly removed. Also disables LOCK, FALLBACK, and
+  everything enabled by REWRITE_TABLE (see the lilo documentation).
+
+ROCKCFG_PKG_LILO_XL_SECS
+  Support for extra large (non-standard) floppies. The number of sectors
+  is set in the BIOS disk parameter table to the specified value. Note
+  that this hack may yield incorrect behaviour on some systems, and keep
+  this value empty unless you really have a non-standard floppy.

package/x86/lilo/config.in

@@ -0,0 +1,7 @@
+if pkgcheck lilo X
+then
+	menu_begin MENU_PKG_LILO 'LILO Options'
+	bool 'Do not write to disk while booting' ROCKCFG_PKG_LILO_READONLY 0
+	text 'Support for extra large floppies' ROCKCFG_PKG_LILO_XL_SECS ""
+	menu_end
+fi

package/x86/lilo/lilo.conf

@@ -25,10 +25,23 @@ pm_lilo() {
 		cp $confdir/etc-lilo.conf $root/etc/lilo.conf
 	fi
 	
-	cp -r doc/ $docdir ; cp -v *.com activate $docdir
+	cp -vf *.com activate $docdir
 	cp $confdir/stone_mod_lilo.sh $root/etc/stone.d/mod_lilo.sh
 }
 
+pc_lilo() {
+	if [ "$ROCKCFG_PKG_LILO_READONLY" = 1 ] ; then
+		mv Makefile Makefile.orig
+		sed -e "s/-DREWRITE_TABLE/-DREADONLY/" Makefile.orig > Makefile
+	fi
+	if [ "$ROCKCFG_PKG_LILO_XL_SECS" ] ; then
+		mv Makefile Makefile.orig
+		sed -e "s/-DVIRTUAL/-DVIRTUAL -DXL_SECS=$ROCKCFG_PKG_LILO_XL_SECS/" \
+		   Makefile.orig > Makefile
+	fi
+}
+
+preconf="pc_lilo"
 makeinstopt="ROOT=$root $makeinstopt"
 postmake=pm_lilo
 

target/bootdisk/x86/makeimages.sh

@@ -1,9 +1,16 @@
 #!/bin/sh
 
+if [ "$1" = -reroot ] ; then
+	echo "Old PATH: $PATH"
+	PATH="../root/sbin:../root/bin:../root/usr/sbin:../usr/bin:$PATH"
+	echo "New PATH: $PATH"
+	shift
+fi
+
 if [ "$1" = -combo ] ; then
 	combo=1
 elif [ "$#" != 0 ] ; then
-	echo "usage: $0 [-combo]"
+	echo "usage: $0 [-reroot] [-combo]"
 	exit 1
 fi