[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: tail rootskel/linuxrc inconsistent



On Wed, Oct 01, 2003 at 01:54:00PM -0400, Joey Hess wrote:
> Geert Stappers wrote:
> > In rootskel are three versions of linuxrc.
> > I was expecting that they all all three the same, however:
> 
> The usb one is not complete and may actually be removed (if I manage to
> cram usb storage support onto the regular boot floppy).
> 
> > Shouldn't DEBCONF_DEBUG and BOOT_DEBUG merge into one?
> 
> Yes, if I end up using the usb one then it will be changed to use
> BOOT_DEBUG

$ cvs diff -u rootskel/src/linuxrc.usbfloppy
Index: rootskel/src/linuxrc.usbfloppy
===================================================================
RCS file: /cvs/debian-boot/debian-installer/rootskel/src/linuxrc.usbfloppy,v
retrieving revision 1.1
diff -u -r1.1 linuxrc.usbfloppy
--- rootskel/src/linuxrc.usbfloppy      27 Sep 2003 12:13:45 -0000      1.1
+++ rootskel/src/linuxrc.usbfloppy      1 Oct 2003 20:38:47 -0000
@@ -1,7 +1,9 @@
 #!/bin/sh
 # This is a special linuxrc for the usb-chainboot floppy image.
+# it is not complete and may actually be removed
+# (if we manage to cram usb storage support onto the regular boot floppy)
  
-if [ "$DEBCONF_DEBUG" -gt 1 ]; then
+if [ "$BOOT_DEBUG" -gt 1 ]; then
        set -x
 fi
  
@@ -62,8 +64,8 @@
 umount initrd/usb
 rm -f linuxrc # this program
 ln -s /sbin/init linuxrc
-if [ "$DEBCONF_DEBUG" -gt 0 ]; then
-       echo "This is ia debug shell, just before running the new linuxrc."
+if [ "$BOOT_DEBUG" -gt 0 ]; then
+       echo "This is a debug shell, just before running the new linuxrc."
        sh
 fi
 exec /usr/sbin/chroot . /linuxrc <dev/console >dev/console 2>&1

> 
> > Can have linuxrc also a debug shell?
> 
> If it's useful..
> 

It seems to be usefull for linuxrc.bootfloppy and linuxrc.usbfloppy,
however I don't have see yet how to activate the debug option,
so I don't change[1] the linuxrc.


Geert Stappers

[1] provide a patch



Reply to: