devil-linux-develop — developer discussions

Re: [Devil-linux-develop] [PATCH] install-on-usb - major enhancements (I think)

[Tim T. <t....@co...>]

Heiko Zuerker wrote:

> All Done.
>
> But there's still a problem:
> when the script copies the stuff onto the device, cp prints a warning 
> about omitting the directories grub and lilo.
> Can you take a look at this?
>
> Heiko

Sure. I think the fix will be to just send it to > /dev/null though. Or 
we could just copy them, in case the user ever wants to switch 
bootloaders.  I don't think I have a lilo sub dir on mine tho... curious.

Tim

[Devil-linux-develop] Sagator - any recommendations?

[William G. <dl-...@gm...>]

All,

I have had getting sagator working on my firewall on the back burner for a while.  This evening, I started doing research to try to get it working.  At this point, I am totally confused!  I have not been able to find much documentation on how to configure sagator.  The official sagator site has a rudimentary readme but the explanation contained within is not sufficient for this brain bust to figure it out.  Additionally, I am at a lost on making sure that ClamAV ties into the sagator jail appropriately.

Do any of you know of any documentation regarding getting sagator/clamav/postfix to work on DL?

If not, I would appreciate any configuration hints, tips or config files/snippets.  

Thanks in advance!

William

Re: [Devil-linux-develop] [PATCH] install-on-usb - major enhancements (I think)

[Heiko Z. <he...@zu...>]

All Done.

But there's still a problem:
when the script copies the stuff onto the device, cp prints a warning 
about omitting the directories grub and lilo.
Can you take a look at this?

Heiko

Tim Tait wrote:
> Tim Tait wrote:
> 
>>
>> In the process of fixing the broken gub/lilo support, I've made some 
>> significant chnages to "install-on-usb", hopefully you will find them 
>> as useful as I do. The diff as well as the complete file is attached 
>> for easier review. Item (5) means install-on-usb should be included 
>> inside the ISO as well, hence the mods to copy-base.
>>
>> Comments?
>>
>> Tim
>>
>> ----------------------------
>> Changes:
>> 1. Fixed Grub/Lilo stuff to copy the bootcd.iso rather than the whole 
>> contents.
>>
>> 2. Auto-replaced /dev/sda style device names with link contents (who 
>> likes having to type that??) to allow to work with devfs.
>>
>> 3. Added prompts for formerly implict selections embedded in script 
>> (such as choice of grub/lilo/syslinux)
>>
>> 4. Added prompt/support for initrd with ext2 (changes required ramdisk 
>> block size)
>>
>> 5. Added ability to make the bootcd.iso from the actual DL CD itself - 
>> solves chicken-and-egg problem, no need to get ISO and Dist archive. 
>> In theory allows boot of target machine from CD and self-install to 
>> USB/disk. I did not test this yet, but did install CD based image OK. 
>> dd copy is done with info based on isosize so does not have problems 
>> with CD-Rs and creates binary duplicate of original iso.
>>
>> 6. Option to copy your own config file to disk, with option to use 
>> different partition (recommended).
>>
>> 7. General code cleanup.
> 
> 
> Oops, one mistake with the sequence of events for the fdisk need to get 
> the device before I can call fdisk. Last minute changes always get you:) 
> Fixed now.
> 
> Tim
> 
> 
> ------------------------------------------------------------------------
> 
> #!/bin/bash
> #
> # $Source: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v $
> # $Revision: 1.12 $
> # $Date: 2003/11/16 16:29:38 $
> #
> # http://www.devil-linux.org
> #
> # This script will install Devil-Linux on a USB storage DEVICE
> #
> #
> 
> TMPDIR="./tmp-install2usb"
> 
> #### Pick your favorite disk part tool:
> FDISK="fdisk"
> #FDISK="cfdisk"
> 
> copy_iso_file ()
> {
> 	# $1 = source device or file
> 	# $2 = target file path
> 
> 	isosize_bin="$TMPDIR/iso-mnt/usr/bin/isosize"
> 	if [ -b "$1" ]; then
> 		#which isosize || { echo "Utility isosize not found - can not copy from a CD."; return 1; }
> 		echo "copying image of CD in $1 to device mounted on $2"
> 		iso_info=`$isosize_bin -x $1`
> 		nsectors=`echo $iso_info | cut -d' ' -f3 | cut -d',' -f1`
> 		bs=`echo $iso_info  | cut -d' ' -f6`
> 		nice dd bs=$bs count=$nsectors if=$1 of=$2 || return 1
> 		return 0
> 	elif [ -f "$1" ]; then
> 		echo "copying source file $1 to device mounted on $2"
> 		nice cp -p $1 $2 || return 1
> 		return 0
> 	else
> 		echo "$1 is not a valid source for the ISO"
> 		return 1
> 	fi
> }
> 
> ask_yes_no ()
> {
> 	ANS=""
> 	read -p " (y/n) " -t 60 -n 1 -rs ANS
> 	echo $ANS
> 	[ ${ANS:-n} = "y" -o ${ANS:-n} = "Y" ] && return 0
> 	return 1
> }
> 
> ## most USB parts taken from the usb-mount script from Michael Hamilton ( mi...@ac... )
> #function scsiDevFromScsiUsb {
> #	echo $1 | awk -F"[-/]" '{ n=$(NF-1);  print "/dev/sd" substr("abcdefghijklmnopqrstuvwxyz", n+1, 1) "1" }'
> #}
> #
> #function allAttachedScsiUsb {
> #	find /proc/scsi/ -path '/proc/scsi/usb-storage*' -type f | xargs grep -l 'Attached: Yes'
> #}
> #
> #function allDetachedScsiUsb {
> #	find /proc/scsi/ -path '/proc/scsi/usb-storage*' -type f | xargs grep -l 'Attached: No'
> #}
> 
> install_lilo ()
> {
> 	echo "Configuring LILO boot sector and menu"
> 	cat  > $TMPDIR/disk-mnt/boot/lilo.conf  <<-EOF
> 		read-only
> 		compact
> 		lba32
> 		timeout = 60
> 		# Override dangerous defaults that rewrite the partition table:
> 		change-rules
> 		reset
> 		default = Devil-Linux
> 		message = /boot/message
> 		disk = /dev/sda
> 		bios = 0x80
> 
> 		image  = /boot/vmlinuz
> 			label  = Devil-Linux
> 			append = "init=/linuxrc $RAMDISK"
> 			root = /dev/ram0
> 			initrd = /boot/initrd.gz
> 
> 	EOF
> 	cp /boot/boot.b tmp/disk-mnt/boot/ || return 1
> 	cp /boot/mbr.b tmp/disk-mnt/boot/ || return 1
> 	lilo -r $TMPDIR/disk-mnt -C /boot/lilo.conf -M $1 || return 1
> 	lilo -r $TMPDIR/disk-mnt -C /boot/lilo.conf -b $1 || return 1
> }
> 
> install_grub ()
> {
> 	echo "Configuring Grub boot sector and menu..."
> 	grub_shell=$TMPDIR/iso-mnt/sbin/grub
> 	device_map=grub-tmp-map
> 	force_lba=""
> 			
> 	if [ ! -f "$grub_shell" ]; then
>            echo "Grub not found in ISO image - was it included in the DL build?"
> 	   umount $TMPDIR/iso-mnt #|| exit 1
> 	   umount $TMPDIR/disk-mnt #|| exit 1
> 	   exit 1
> 	fi
> 	
> 	rm -f $device_map
> 
> 	cat  > $TMPDIR/disk-mnt/boot/grub/grub.conf  <<-EOF
> 	timeout=10
> 	splashimage=(hd0,$2)/boot/grub/devil-linux.xpm.gz
> 	title Devil-Linux - Standard VGA
> 	      root (hd0,$2)
> 	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK
> 	      initrd /boot/initrd.gz
> 	title Devil-Linux - VESA Frame Buffer 640x480
> 	      root (hd0,$2)
> 	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=769
> 	      initrd /boot/initrd.gz
> 	title Devil-Linux - VESA Frame Buffer 800x600
> 	      root (hd0,$2)
> 	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=771
> 	      initrd /boot/initrd.gz
> 	title Devil-Linux - VESA Frame Buffer 1024x768
> 	      root (hd0,$2)
> 	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=773
> 	      initrd /boot/initrd.gz
> 	title Devil-Linux - Other
> 	      root (hd0,$2)
> 	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=ask
> 	      initrd /boot/initrd.gz
> 	EOF
> 	if [ -f "$TMPDIR/disk-mnt/boot/memtest" ]; then
> 		cat >> $TMPDIR/disk-mnt/boot/grub/grub.conf  <<-EOF
> 		title Memtest86
> 			root (hd0,$2)
> 			kernel /boot/memtest
> 		EOF
> 	fi
> 	pushd $TMPDIR/disk-mnt/boot/grub > /dev/null
> 	rm -f menu.lst
> 	ln -s grub.conf menu.lst
> 	popd > /dev/null
> 
> 	$grub_shell --batch --device-map=$device_map <<-EOF > /dev/null
> 		quit
> 		EOF
> 
> 	install_drive=$(grep "$1\$" $device_map|cut -f1)
> 	root_drive="${install_drive%%)},0)"
> 
> 	$grub_shell --batch --device-map=$device_map <<-EOF > /dev/null
> 		root $root_drive
> 		setup $force_lba $install_drive
> 		quit
> 		EOF
> 	rm -f $device_map
> }
> 
> install_dl ()
> {
> 
> 	if [ -d "$TMPDIR" ]; then
> 		# unclean exit before
> 		umount $TMPDIR/iso-mnt &> /dev/null 
> 		umount $TMPDIR/disk-mnt &> /dev/null		
> 		rm -rf $TMPDIR &> /dev/null
> 	fi
> 
> 	mkdir -p $TMPDIR/iso-mnt || return 1
> 	mkdir -p $TMPDIR/disk-mnt || return 1
> 
> #	echo "Available USB storage devices: "
> #	for device in $(allAttachedScsiUsb)
> #	do
> #		echo -n "$(scsiDevFromScsiUsb $device) "
> #	done
> 
> 	echo
> 	read -p "Enter DL ISO source (disk file or CD device) -> " DLISO
> 
> 	if [ -L "$DLISO" ]; then
> 		DLISO=$(readlink -fns $DLISO)
> 		echo " Expanding link to: $DLISO"
> 	fi
> 	if [ ! -e "$DLISO" ]; then
> 		echo " Cannot find file or device:  $DLISO"
> 		return 1
> 	fi
> 
> 	if [ -b "$DLISO" ]; then
> 		mount -t iso9660 -o ro $DLISO $TMPDIR/iso-mnt || return 1
> 	else
> 		mount -o loop,ro -t iso9660 $DLISO $TMPDIR/iso-mnt || return 1
> 	fi
> 	if [ -f "$TMPDIR/iso-mnt/DEVIL-LINUX" ]; then
> 		dl_version=`cat $TMPDIR/iso-mnt/DEVIL-LINUX`
> 		echo " Devil Linux $dl_version found in ISO"
> 	else
> 		echo
> 		echo "$DLISO does not seem to contain Devil-Linux!"
> 		return 1
> 	fi
> 
> 	echo
> 	read -p "Enter DEVICE name of disk device (i.e. /dev/sda) -> " DEVICE
> 
> 	$FDISK -l $DEVICE
> 
> 	echo
> 	echo "If you wish to store the ISO and configuration on the same media, two partitions are recommended."
> 	echo -n "Do you want to partition the media first? "
> 	ask_yes_no && $FDISK $DEVICE
> 	
> 	echo
> 	read -p "Enter PARTITION name of disk device to put ISO file (i.e. /dev/sda1) -> " PARTITION
> 
> 	if [ -L "$PARTITION" ]; then
> 		PARTITION=$(readlink -fns $PARTITION)
> 		echo " Expanding link to full partition name for devfs : $PARTITION"
> 	fi
> 	if [ ! -b "$PARTITION" ]; then
> 		echo " Cannot find device:  $PARTITION"
> 		return 1
> 	fi
> 
> 	if [ -L "$DEVICE" ]; then
> 		DEVICE=$(readlink -fns $DEVICE)
> 		echo " Expanding link to full device name for devfs : $DEVICE"
> 	fi
> 	if [ ! -b "$DEVICE" ]; then
> 		echo " Cannot find device:  $DEVICE"
> 		return 1
> 	fi
> 
> 	echo
> 	ETC_FILE=""
> 	read -p "Enter configuration file to preload to disk (if any) -> " ETC_FILE
> 	if [ -n "$ETC_FILE" ]; then
> 		if [ ! -f "$ETC_FILE" ]; then
> 			echo " No such file: \"$ETC_FILE\""
> 			return 1
> 		else
> 			read -p "Enter seperate partition for configuration (recommended) or enter if same -> " ETC_PART
> 			if [ -z "$ETC_PART" ]; then
> 				ETC_PART=$PARTITION
> 			elif [ ! -b "$ETC_PART" ]; then
> 				echo " Can not find partition \"$ETC_PART\""
> 				return 1
> 			else
> 				echo;echo -n "All data on device $ETC_PART will be lost, continue ? "
> 				ask_yes_no || return 1
> 
> 				echo;echo -n "Last chance, do you really want to continue ? "
> 				ask_yes_no || return 1
> 
> 				mkfs.ext2 $ETC_PART > /dev/null || return 1
> 			fi
> 		fi
> 	fi
> 
> 	echo
> 	echo "This will install DL on \"$DEVICE\" using the \"$BOOTLOADER\" bootloader. "
> 
> 	if [ "$BOOTLOADER" = "syslinux" ]; then
>   		echo "Please make sure the partition type is 'FAT16' (06) "
> 		echo	
> 	else
> 		echo "Please make sure the partition type is 'Linux' (83) "
> 		echo
> 	fi
> 
> 	echo;echo -n "All data on device $PARTITION will be lost, continue ? "
> 	ask_yes_no || return 1
> 
> 	echo;echo -n "Last chance, do you really want to continue ? "
> 	ask_yes_no || return 1
> 
> 	if [ "$BOOTLOADER" = "syslinux" ]; then
> 
> 		mkfs.msdos $PARTITION > /dev/null || return 1
> 
> 		echo "Installing syslinux MBR"
> 		SIZE=$(du -b $TMPDIR/iso-mnt/boot/syslinux/mbr.bin | cut -f 1 )
> 		dd if=$TMPDIR/iso-mnt/boot/syslinux/mbr.bin of=$DEVICE count=$SIZE || return 1
> 		echo installing SysLinux boot sector
> 		$TMPDIR/iso-mnt/boot/syslinux/syslinux-nomtools $PARTITION || return 1
> 
> 		mount -t vfat $PARTITION $TMPDIR/disk-mnt || return 1
> 
> 		echo "copying files"
> 		cp -p $TMPDIR/iso-mnt/boot/* $TMPDIR/disk-mnt/ > /dev/null
> 		cp -p $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ > /dev/null
> 		cat $TMPDIR/iso-mnt/isolinux.cfg | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/syslinux.cfg || return 1
> 		cat $TMPDIR/iso-mnt/boot/message | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/message || return 1
> 		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
> 
> 	elif [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then
> 
> 		mkfs.ext2 $PARTITION > /dev/null || return 1
> 		tune2fs -c 0 $PARTITION
> 
> 		mount -t auto $PARTITION $TMPDIR/disk-mnt || return 1
> 
> 		echo "copying files"
> 		cp -a $TMPDIR/iso-mnt/boot/ $TMPDIR/disk-mnt/ > /dev/null
> 		cp -p $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ > /dev/null
> 		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
> 		GRUBPART=$(expr $(basename ${PARTITION} | sed -e 's/^part//' -e 's/^[hs]d[a-z]//') - 1)
> 
> 		[ "$BOOTLOADER" = "grub" ] && install_grub $DEVICE $GRUBPART
> 		[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE	
> 
> 	else
> 		echo "Unknown Bootloader: $BOOTLOADER"
> 		return 1
> 	fi
> 
> 	if [ -n "$ETC_FILE" ]; then
> 		mkdir -p $TMPDIR/etc-mnt
> 		mount -t auto $ETC_PART $TMPDIR/etc-mnt
> 		echo
> 		echo "Copying $ETC_FILE to $TMPDIR/etc-mnt/etc.tar.bz2"
> 		cp -p $ETC_FILE $TMPDIR/etc-mnt/etc.tar.bz2 > /dev/null || return 1
> 		sync
> 		umount $TMPDIR/etc-mnt > /dev/null
> 	fi
> 
> 	return 0;
> }
> 
> ##########################################################################
> 
> echo
> echo "This will install the Devil Linux ISO image to a disk device (USB/SCSI/IDE)"
> echo "and make it bootable, assuming that your PC can boot this device."
> 
> ### Get some user info for the install
> echo
> echo "Select which bootloader you want to use:"
> echo " 1) SysLinux"
> echo " 2) Grub"
> echo " 3) Lilo"
> ANS=""
> read -p "Choice: " -t 60 -n 1 -rs ANS
> ANS=${ANS:-1}
> echo $ANS
> 
> ### set the default
> BOOTLOADER="syslinux"
> #BOOTLOADER="grub"
> #BOOTLOADER="lilo"
> 
> [ ${ANS:-n} = "1" ] && BOOTLOADER="syslinux"
> [ ${ANS:-n} = "2" ] && BOOTLOADER="grub"
> [ ${ANS:-n} = "3" ] && BOOTLOADER="lilo"
> 
> #### Choose the format used during build for initrd.gz:
> echo
> echo "Select correct initrd.gz format used (DL default is CramFS):"
> echo " 1) CramFS"
> echo " 2) Ext2"
> ANS=""
> read -p "Choice: " -t 60 -n 1 -rs ANS
> ANS=${ANS:-1}
> echo $ANS
> 
> # For initrd.gz as CRAMFS
> RAMDISK="ramdisk_blocksize=4096"
> # For initrd.gz as EXT2
> #RAMDISK="ramdisk_blocksize=1024"
> 
> [ ${ANS:-n} = "1" ] && RAMDISK="ramdisk_blocksize=4096";
> [ ${ANS:-n} = "2" ] && RAMDISK="ramdisk_blocksize=1024";
> 
> # Do install
> install_dl || echo "Install failed!"
> 
> echo "syncing and unmounting (this could take a while)"
> sync
> umount $TMPDIR/iso-mnt &> /dev/null 
> umount $TMPDIR/disk-mnt &> /dev/null
> umount $TMPDIR/etc-mnt &> /dev/null
> 
> rm -rf $TMPDIR &> /dev/null
> 
> exit
> 
> 
> ------------------------------------------------------------------------
> 
> --- ./scripts/scripts/install-on-usb.old	2004-05-15 17:36:14.000000000 +0200
> +++ ./scripts/scripts/install-on-usb	2004-05-15 22:39:51.000000000 +0200
> @@ -10,18 +10,41 @@
>  #
>  #
>  
> -BOOTLOADER="syslinux"
> -#BOOTLOADER="grub"
> -#BOOTLOADER="lilo"
> +TMPDIR="./tmp-install2usb"
>  
> +#### Pick your favorite disk part tool:
>  FDISK="fdisk"
>  #FDISK="cfdisk"
>  
> +copy_iso_file ()
> +{
> +	# $1 = source device or file
> +	# $2 = target file path
> +
> +	isosize_bin="$TMPDIR/iso-mnt/usr/bin/isosize"
> +	if [ -b "$1" ]; then
> +		#which isosize || { echo "Utility isosize not found - can not copy from a CD."; return 1; }
> +		echo "copying image of CD in $1 to device mounted on $2"
> +		iso_info=`$isosize_bin -x $1`
> +		nsectors=`echo $iso_info | cut -d' ' -f3 | cut -d',' -f1`
> +		bs=`echo $iso_info  | cut -d' ' -f6`
> +		nice dd bs=$bs count=$nsectors if=$1 of=$2 || return 1
> +		return 0
> +	elif [ -f "$1" ]; then
> +		echo "copying source file $1 to device mounted on $2"
> +		nice cp -p $1 $2 || return 1
> +		return 0
> +	else
> +		echo "$1 is not a valid source for the ISO"
> +		return 1
> +	fi
> +}
> +
>  ask_yes_no ()
>  {
>  	ANS=""
>  	read -p " (y/n) " -t 60 -n 1 -rs ANS
> -	echo
> +	echo $ANS
>  	[ ${ANS:-n} = "y" -o ${ANS:-n} = "Y" ] && return 0
>  	return 1
>  }
> @@ -41,7 +64,8 @@
>  
>  install_lilo ()
>  {
> -	cat  > ./tmp/mnt2/boot/lilo.conf  <<-EOF
> +	echo "Configuring LILO boot sector and menu"
> +	cat  > $TMPDIR/disk-mnt/boot/lilo.conf  <<-EOF
>  		read-only
>  		compact
>  		lba32
> @@ -56,68 +80,77 @@
>  
>  		image  = /boot/vmlinuz
>  			label  = Devil-Linux
> -			append = "init=/linuxrc ramdisk_blocksize=4096"
> +			append = "init=/linuxrc $RAMDISK"
>  			root = /dev/ram0
>  			initrd = /boot/initrd.gz
>  
>  	EOF
> -	cp /boot/boot.b tmp/mnt2/boot/ || return 1
> -	cp /boot/mbr.b tmp/mnt2/boot/ || return 1
> -	lilo -r ./tmp/mnt2 -C /boot/lilo.conf -M $1 || return 1
> -	lilo -r ./tmp/mnt2 -C /boot/lilo.conf -b $1 || return 1
> +	cp /boot/boot.b tmp/disk-mnt/boot/ || return 1
> +	cp /boot/mbr.b tmp/disk-mnt/boot/ || return 1
> +	lilo -r $TMPDIR/disk-mnt -C /boot/lilo.conf -M $1 || return 1
> +	lilo -r $TMPDIR/disk-mnt -C /boot/lilo.conf -b $1 || return 1
>  }
>  
>  install_grub ()
>  {
> -	grub_shell=./tmp/mnt2/sbin/grub
> +	echo "Configuring Grub boot sector and menu..."
> +	grub_shell=$TMPDIR/iso-mnt/sbin/grub
>  	device_map=grub-tmp-map
>  	force_lba=""
> +			
> +	if [ ! -f "$grub_shell" ]; then
> +           echo "Grub not found in ISO image - was it included in the DL build?"
> +	   umount $TMPDIR/iso-mnt #|| exit 1
> +	   umount $TMPDIR/disk-mnt #|| exit 1
> +	   exit 1
> +	fi
> +	
>  	rm -f $device_map
>  
> -	cat  > ./tmp/mnt2/boot/grub/grub.conf  <<-EOF
> +	cat  > $TMPDIR/disk-mnt/boot/grub/grub.conf  <<-EOF
>  	timeout=10
>  	splashimage=(hd0,$2)/boot/grub/devil-linux.xpm.gz
>  	title Devil-Linux - Standard VGA
>  	      root (hd0,$2)
> -	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096
> +	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK
>  	      initrd /boot/initrd.gz
>  	title Devil-Linux - VESA Frame Buffer 640x480
>  	      root (hd0,$2)
> -	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=769
> +	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=769
>  	      initrd /boot/initrd.gz
>  	title Devil-Linux - VESA Frame Buffer 800x600
>  	      root (hd0,$2)
> -	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=771
> +	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=771
>  	      initrd /boot/initrd.gz
>  	title Devil-Linux - VESA Frame Buffer 1024x768
>  	      root (hd0,$2)
> -	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=773
> +	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=773
>  	      initrd /boot/initrd.gz
>  	title Devil-Linux - Other
>  	      root (hd0,$2)
> -	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=ask
> +	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=ask
>  	      initrd /boot/initrd.gz
>  	EOF
> -	if [ -f ./tmp/mnt2/boot/memtest ]; then
> -		cat >> ./tmp/mnt2/boot/grub/grub.conf  <<-EOF
> +	if [ -f "$TMPDIR/disk-mnt/boot/memtest" ]; then
> +		cat >> $TMPDIR/disk-mnt/boot/grub/grub.conf  <<-EOF
>  		title Memtest86
>  			root (hd0,$2)
>  			kernel /boot/memtest
>  		EOF
>  	fi
> -	pushd ./tmp/mnt2/boot/grub > /dev/null
> +	pushd $TMPDIR/disk-mnt/boot/grub > /dev/null
>  	rm -f menu.lst
>  	ln -s grub.conf menu.lst
>  	popd > /dev/null
>  
> -	$grub_shell --batch --device-map=$device_map <<-EOF
> +	$grub_shell --batch --device-map=$device_map <<-EOF > /dev/null
>  		quit
>  		EOF
>  
>  	install_drive=$(grep "$1\$" $device_map|cut -f1)
>  	root_drive="${install_drive%%)},0)"
>  
> -	$grub_shell --batch --device-map=$device_map <<-EOF
> +	$grub_shell --batch --device-map=$device_map <<-EOF > /dev/null
>  		root $root_drive
>  		setup $force_lba $install_drive
>  		quit
> @@ -125,97 +158,231 @@
>  	rm -f $device_map
>  }
>  
> -function install
> +install_dl ()
>  {
> -	test -d ./tmp && rm -rf ./tmp
>  
> -	mkdir -p ./tmp/mnt{1,2} || return 1
> +	if [ -d "$TMPDIR" ]; then
> +		# unclean exit before
> +		umount $TMPDIR/iso-mnt &> /dev/null 
> +		umount $TMPDIR/disk-mnt &> /dev/null		
> +		rm -rf $TMPDIR &> /dev/null
> +	fi
> +
> +	mkdir -p $TMPDIR/iso-mnt || return 1
> +	mkdir -p $TMPDIR/disk-mnt || return 1
>  
>  #	echo "Available USB storage devices: "
>  #	for device in $(allAttachedScsiUsb)
>  #	do
>  #		echo -n "$(scsiDevFromScsiUsb $device) "
>  #	done
> -	echo
> -	read -p "Enter PARTITION name on USB device (i.e. /dev/sda1) -> " PARTITION
> -	read -p "Enter DEVICE name of USB device (i.e. /dev/sda) -> " DEVICE
>  
> +	echo
> +	read -p "Enter DL ISO source (disk file or CD device) -> " DLISO
>  
> -	for device in "$PARTITION" "$DEVICE"
> -	do
> -		if [ -L $device ]; then
> -			echo "If you are using devfs, you must supply the full device, not the link."
> -			exit
> -		fi
> -		if [ ! -b $device ]; then
> -			echo "Cannot find:  $device"
> -			exit
> -		fi
> -	done
> +	if [ -L "$DLISO" ]; then
> +		DLISO=$(readlink -fns $DLISO)
> +		echo " Expanding link to: $DLISO"
> +	fi
> +	if [ ! -e "$DLISO" ]; then
> +		echo " Cannot find file or device:  $DLISO"
> +		return 1
> +	fi
>  
> -	GRUBPART=$(expr $(basename ${PARTITION} | sed -e 's/^part//' -e 's/^[hs]d[a-z]//') - 1)
> +	if [ -b "$DLISO" ]; then
> +		mount -t iso9660 -o ro $DLISO $TMPDIR/iso-mnt || return 1
> +	else
> +		mount -o loop,ro -t iso9660 $DLISO $TMPDIR/iso-mnt || return 1
> +	fi
> +	if [ -f "$TMPDIR/iso-mnt/DEVIL-LINUX" ]; then
> +		dl_version=`cat $TMPDIR/iso-mnt/DEVIL-LINUX`
> +		echo " Devil Linux $dl_version found in ISO"
> +	else
> +		echo
> +		echo "$DLISO does not seem to contain Devil-Linux!"
> +		return 1
> +	fi
>  
>  	echo
> -	#echo "Please make sure the partition type is 'Linux' (83) "
> -	echo "Please make sure the partition type is 'FAT16' (06) "
> -	echo
> +	read -p "Enter DEVICE name of disk device (i.e. /dev/sda) -> " DEVICE
>  
>  	$FDISK -l $DEVICE
>  
> -	echo;echo -n "Do you want to partition the media ? "
> +	echo
> +	echo "If you wish to store the ISO and configuration on the same media, two partitions are recommended."
> +	echo -n "Do you want to partition the media first? "
>  	ask_yes_no && $FDISK $DEVICE
> +	
> +	echo
> +	read -p "Enter PARTITION name of disk device to put ISO file (i.e. /dev/sda1) -> " PARTITION
> +
> +	if [ -L "$PARTITION" ]; then
> +		PARTITION=$(readlink -fns $PARTITION)
> +		echo " Expanding link to full partition name for devfs : $PARTITION"
> +	fi
> +	if [ ! -b "$PARTITION" ]; then
> +		echo " Cannot find device:  $PARTITION"
> +		return 1
> +	fi
> +
> +	if [ -L "$DEVICE" ]; then
> +		DEVICE=$(readlink -fns $DEVICE)
> +		echo " Expanding link to full device name for devfs : $DEVICE"
> +	fi
> +	if [ ! -b "$DEVICE" ]; then
> +		echo " Cannot find device:  $DEVICE"
> +		return 1
> +	fi
> +
> +	echo
> +	ETC_FILE=""
> +	read -p "Enter configuration file to preload to disk (if any) -> " ETC_FILE
> +	if [ -n "$ETC_FILE" ]; then
> +		if [ ! -f "$ETC_FILE" ]; then
> +			echo " No such file: \"$ETC_FILE\""
> +			return 1
> +		else
> +			read -p "Enter seperate partition for configuration (recommended) or enter if same -> " ETC_PART
> +			if [ -z "$ETC_PART" ]; then
> +				ETC_PART=$PARTITION
> +			elif [ ! -b "$ETC_PART" ]; then
> +				echo " Can not find partition \"$ETC_PART\""
> +				return 1
> +			else
> +				echo;echo -n "All data on device $ETC_PART will be lost, continue ? "
> +				ask_yes_no || return 1
> +
> +				echo;echo -n "Last chance, do you really want to continue ? "
> +				ask_yes_no || return 1
> +
> +				mkfs.ext2 $ETC_PART > /dev/null || return 1
> +			fi
> +		fi
> +	fi
>  
> -	echo;echo "     Partition:  $PARTITION"
> -	echo "     Device:  $DEVICE"
> +	echo
> +	echo "This will install DL on \"$DEVICE\" using the \"$BOOTLOADER\" bootloader. "
>  
> -	echo;echo -n "All data on device will be lost, continue ? "
> -	ask_yes_no || return 0
> +	if [ "$BOOTLOADER" = "syslinux" ]; then
> +  		echo "Please make sure the partition type is 'FAT16' (06) "
> +		echo	
> +	else
> +		echo "Please make sure the partition type is 'Linux' (83) "
> +		echo
> +	fi
> +
> +	echo;echo -n "All data on device $PARTITION will be lost, continue ? "
> +	ask_yes_no || return 1
>  
>  	echo;echo -n "Last chance, do you really want to continue ? "
> -	ask_yes_no || return 0
> +	ask_yes_no || return 1
>  
>  	if [ "$BOOTLOADER" = "syslinux" ]; then
> -		mkfs.msdos $PARTITION || return 1
>  
> -		mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
> +		mkfs.msdos $PARTITION > /dev/null || return 1
>  
> -		echo installing MBR
> -		SIZE=$(du -b ./tmp/mnt1/boot/syslinux/mbr.bin | cut -f 1 )
> -		dd if=./tmp/mnt1/boot/syslinux/mbr.bin of=$DEVICE count=$SIZE || return 1
> +		echo "Installing syslinux MBR"
> +		SIZE=$(du -b $TMPDIR/iso-mnt/boot/syslinux/mbr.bin | cut -f 1 )
> +		dd if=$TMPDIR/iso-mnt/boot/syslinux/mbr.bin of=$DEVICE count=$SIZE || return 1
>  		echo installing SysLinux boot sector
> -		./tmp/mnt1/boot/syslinux/syslinux-nomtools $PARTITION || return 1
> +		$TMPDIR/iso-mnt/boot/syslinux/syslinux-nomtools $PARTITION || return 1
>  
> -		mount -t vfat $PARTITION ./tmp/mnt2 || return 1
> +		mount -t vfat $PARTITION $TMPDIR/disk-mnt || return 1
>  
> -		echo copying files
> -		cp ./tmp/mnt1/boot/* ./tmp/mnt2/ &> /dev/null
> -		cp ./tmp/mnt1/{DEVIL-LINUX,LICENSE} ./tmp/mnt2/ &> /dev/null
> -		cat ./tmp/mnt1/isolinux.cfg | sed -e s%"/boot/"%""% > ./tmp/mnt2/syslinux.cfg || return 1
> -		cat ./tmp/mnt1/boot/message | sed -e s%"/boot/"%""% > ./tmp/mnt2/message || return 1
> -		cp bootcd.iso ./tmp/mnt2/ || return 1
> -	fi
> +		echo "copying files"
> +		cp -p $TMPDIR/iso-mnt/boot/* $TMPDIR/disk-mnt/ > /dev/null
> +		cp -p $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ > /dev/null
> +		cat $TMPDIR/iso-mnt/isolinux.cfg | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/syslinux.cfg || return 1
> +		cat $TMPDIR/iso-mnt/boot/message | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/message || return 1
> +		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
> +
> +	elif [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then
>  
> -	if [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then
> -		mkfs.ext2 $PARTITION || return 1
> +		mkfs.ext2 $PARTITION > /dev/null || return 1
>  		tune2fs -c 0 $PARTITION
>  
> -		mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
> -		mount -t auto $PARTITION ./tmp/mnt2 || return 1
> +		mount -t auto $PARTITION $TMPDIR/disk-mnt || return 1
>  
> -		echo copying files...
> -		nice -n19 cp -dpR ./tmp/mnt1/* ./tmp/mnt2/ || return 1
> -		nice -n19 cp -dpR etc.tar.bz2 ./tmp/mnt2/ || return 1
> +		echo "copying files"
> +		cp -a $TMPDIR/iso-mnt/boot/ $TMPDIR/disk-mnt/ > /dev/null
> +		cp -p $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ > /dev/null
> +		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
> +		GRUBPART=$(expr $(basename ${PARTITION} | sed -e 's/^part//' -e 's/^[hs]d[a-z]//') - 1)
>  
>  		[ "$BOOTLOADER" = "grub" ] && install_grub $DEVICE $GRUBPART
> -		[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE
> +		[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE	
> +
> +	else
> +		echo "Unknown Bootloader: $BOOTLOADER"
> +		return 1
> +	fi
> +
> +	if [ -n "$ETC_FILE" ]; then
> +		mkdir -p $TMPDIR/etc-mnt
> +		mount -t auto $ETC_PART $TMPDIR/etc-mnt
> +		echo
> +		echo "Copying $ETC_FILE to $TMPDIR/etc-mnt/etc.tar.bz2"
> +		cp -p $ETC_FILE $TMPDIR/etc-mnt/etc.tar.bz2 > /dev/null || return 1
> +		sync
> +		umount $TMPDIR/etc-mnt > /dev/null
>  	fi
> +
> +	return 0;
>  }
>  
> -install
> +##########################################################################
> +
> +echo
> +echo "This will install the Devil Linux ISO image to a disk device (USB/SCSI/IDE)"
> +echo "and make it bootable, assuming that your PC can boot this device."
> +
> +### Get some user info for the install
> +echo
> +echo "Select which bootloader you want to use:"
> +echo " 1) SysLinux"
> +echo " 2) Grub"
> +echo " 3) Lilo"
> +ANS=""
> +read -p "Choice: " -t 60 -n 1 -rs ANS
> +ANS=${ANS:-1}
> +echo $ANS
> +
> +### set the default
> +BOOTLOADER="syslinux"
> +#BOOTLOADER="grub"
> +#BOOTLOADER="lilo"
> +
> +[ ${ANS:-n} = "1" ] && BOOTLOADER="syslinux"
> +[ ${ANS:-n} = "2" ] && BOOTLOADER="grub"
> +[ ${ANS:-n} = "3" ] && BOOTLOADER="lilo"
> +
> +#### Choose the format used during build for initrd.gz:
> +echo
> +echo "Select correct initrd.gz format used (DL default is CramFS):"
> +echo " 1) CramFS"
> +echo " 2) Ext2"
> +ANS=""
> +read -p "Choice: " -t 60 -n 1 -rs ANS
> +ANS=${ANS:-1}
> +echo $ANS
> +
> +# For initrd.gz as CRAMFS
> +RAMDISK="ramdisk_blocksize=4096"
> +# For initrd.gz as EXT2
> +#RAMDISK="ramdisk_blocksize=1024"
> +
> +[ ${ANS:-n} = "1" ] && RAMDISK="ramdisk_blocksize=4096";
> +[ ${ANS:-n} = "2" ] && RAMDISK="ramdisk_blocksize=1024";
> +
> +# Do install
> +install_dl || echo "Install failed!"
>  
>  echo "syncing and unmounting (this could take a while)"
>  sync
> -umount ./tmp/mnt1 || exit 1
> -umount ./tmp/mnt2 || exit 1
> +umount $TMPDIR/iso-mnt &> /dev/null 
> +umount $TMPDIR/disk-mnt &> /dev/null
> +umount $TMPDIR/etc-mnt &> /dev/null
> +
> +rm -rf $TMPDIR &> /dev/null
>  
> -rm -rf ./tmp || exit 1
> +exit
> 
> 
> ------------------------------------------------------------------------
> 
> --- ./scripts/copy_base.old	2004-05-15 17:56:11.000000000 +0200
> +++ ./scripts/copy_base	2004-05-14 17:17:50.000000000 +0200
> @@ -47,6 +47,7 @@
>  		cp -p $MYDIR/scripts/save-config $CDDIR/bin || exit 1
>  		cp -p $MYDIR/scripts/setup $CDDIR/bin || exit 1
>  		cp -p $MYDIR/scripts/upgrade-config $CDDIR/sbin || exit 1
> +		cp -p $MYDIR/scripts/install-on-usb $CDDIR/sbin || exit 1
>  		cp -p $MYDIR/scripts/pre_init $CDDIR/sbin || exit 1
>  		cp -p $MYDIR/scripts/software-help $CDDIR/usr/share/devillinux || exit 1
>  		cp -p $MYDIR/scripts/keyboardmodels $CDDIR/usr/share/devillinux || exit 1
> 

Re: [Devil-linux-develop] [PATCH] install-on-usb - major enhancements (I think)

[Tim T. <t....@co...>]

Tim Tait wrote:

>
> In the process of fixing the broken gub/lilo support, I've made some 
> significant chnages to "install-on-usb", hopefully you will find them 
> as useful as I do. The diff as well as the complete file is attached 
> for easier review. Item (5) means install-on-usb should be included 
> inside the ISO as well, hence the mods to copy-base.
>
> Comments?
>
> Tim
>
> ----------------------------
> Changes:
> 1. Fixed Grub/Lilo stuff to copy the bootcd.iso rather than the whole 
> contents.
>
> 2. Auto-replaced /dev/sda style device names with link contents (who 
> likes having to type that??) to allow to work with devfs.
>
> 3. Added prompts for formerly implict selections embedded in script 
> (such as choice of grub/lilo/syslinux)
>
> 4. Added prompt/support for initrd with ext2 (changes required ramdisk 
> block size)
>
> 5. Added ability to make the bootcd.iso from the actual DL CD itself - 
> solves chicken-and-egg problem, no need to get ISO and Dist archive. 
> In theory allows boot of target machine from CD and self-install to 
> USB/disk. I did not test this yet, but did install CD based image OK. 
> dd copy is done with info based on isosize so does not have problems 
> with CD-Rs and creates binary duplicate of original iso.
>
> 6. Option to copy your own config file to disk, with option to use 
> different partition (recommended).
>
> 7. General code cleanup.

Oops, one mistake with the sequence of events for the fdisk need to get 
the device before I can call fdisk. Last minute changes always get you:) 
Fixed now.

Tim

[Devil-linux-develop] [PATCH] install-on-usb - major enhancements (I think)

[Tim T. <t....@co...>]

In the process of fixing the broken gub/lilo support, I've made some 
significant chnages to "install-on-usb", hopefully you will find them as 
useful as I do. The diff as well as the complete file is attached for 
easier review. Item (5) means install-on-usb should be included inside 
the ISO as well, hence the mods to copy-base.

Comments?

Tim

----------------------------
Changes:
1. Fixed Grub/Lilo stuff to copy the bootcd.iso rather than the whole 
contents.

2. Auto-replaced /dev/sda style device names with link contents (who 
likes having to type that??) to allow to work with devfs.

3. Added prompts for formerly implict selections embedded in script 
(such as choice of grub/lilo/syslinux)

4. Added prompt/support for initrd with ext2 (changes required ramdisk 
block size)

5. Added ability to make the bootcd.iso from the actual DL CD itself - 
solves chicken-and-egg problem, no need to get ISO and Dist archive. In 
theory allows boot of target machine from CD and self-install to 
USB/disk. I did not test this yet, but did install CD based image OK. dd 
copy is done with info based on isosize so does not have problems with 
CD-Rs and creates binary duplicate of original iso.

6. Option to copy your own config file to disk, with option to use 
different partition (recommended).

7. General code cleanup.

Re: magic SysRq (was Re: [Devil-linux-develop] RTL8169 bugs in 2.4.26)

[Heiko Z. <he...@zu...>]

Friedrich Lobenstock wrote:
> Heiko Zuerker wrote on 12.05.2004 03:46 MET:
> 
>> Tim Tait wrote:
>>
>>> - Where do I turn on the "magic" Alt-sysrq-T thingy? I see it being 
>>> turned on if  support in the init.d/boot script, so it must no be 
>>> comiled in cause the /proc... file does not exist.
>>
>>
>> This is for Kernel debugging, I don't really want to turn this on.
> 
> 
> No not really for kernel debugging only. Magic-SysRequest would be 
> really nice. Didn't we include the patch to achive that via the network?

Nope to yet.

> You can even turn it off or on during runtime (if it is compiled in). 
>  From /etc/init.d/boot.proc on my SuSE 8.2:
> 
> 25              # check if sysrq should be enabled
> 26              #
> 27              if test -e /proc/sys/kernel/sysrq ; then
> 28              if test "$ENABLE_SYSRQ" = yes ; then
> 29                  echo "1" > /proc/sys/kernel/sysrq
> 30              else
> 31                  echo "0" > /proc/sys/kernel/sysrq
> 32              fi
> 33              fi

We currently don;'t have it enabled in the Kernel config.

> BTW take a look at /usr/src/linux/Documentation/sysrq.txt

I rather keep watching the DVD

Heiko

magic SysRq (was Re: [Devil-linux-develop] RTL8169 bugs in 2.4.26)

[Friedrich L. <fl...@fl...>]

Heiko Zuerker wrote on 12.05.2004 03:46 MET:

> Tim Tait wrote:
> 
>> - Where do I turn on the "magic" Alt-sysrq-T thingy? I see it being 
>> turned on if  support in the init.d/boot script, so it must no be 
>> comiled in cause the /proc... file does not exist.
> 
> This is for Kernel debugging, I don't really want to turn this on.

No not really for kernel debugging only. Magic-SysRequest would be really nice. 
Didn't we include the patch to achive that via the network?

You can even turn it off or on during runtime (if it is compiled in). From 
/etc/init.d/boot.proc on my SuSE 8.2:

25              # check if sysrq should be enabled
26              #
27              if test -e /proc/sys/kernel/sysrq ; then
28              if test "$ENABLE_SYSRQ" = yes ; then
29                  echo "1" > /proc/sys/kernel/sysrq
30              else
31                  echo "0" > /proc/sys/kernel/sysrq
32              fi
33              fi

BTW take a look at /usr/src/linux/Documentation/sysrq.txt

-- 
MfG / Regards
Friedrich Lobenstock
____________________________________________________________________
Friedrich Lobenstock                       Linux Services Lobenstock
URL: http://www.lsl.at/                         Email: fl...@fl...
____________________________________________________________________

Re: [Devil-linux-develop] Re: [Devil-linux-commit] build/scripts/scripts postfix,1.3,1.4

[Friedrich L. <fl...@fl...>]

Friedrich Lobenstock wrote on 13.05.2004 20:46 MET:

> Heiko Zuerker wrote on 13.05.2004 14:59 MET:
> 
>>> Update of /cvsroot/devil-linux/build/scripts/scripts
>>> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14789
>>>
>>> Modified Files:
>>>     postfix
>>> Log Message:
>>> startup script did not take care of running postmap on modified db files
>>
>>
>>
>> @Friedrich
>> Can you please add a changelog entry for 1.0 & 1.1 ?
> 
> 
> Sorry, forgot that.
> 

DONE.

-- 
MfG / Regards
Friedrich Lobenstock
____________________________________________________________________
Friedrich Lobenstock                       Linux Services Lobenstock
URL: http://www.lsl.at/                         Email: fl...@fl...
____________________________________________________________________

Re: [Devil-linux-develop] Re: [Devil-linux-commit] build/scripts/scripts postfix,1.3,1.4

[Friedrich L. <fl...@fl...>]

Heiko Zuerker wrote on 13.05.2004 20:57 MET:
>>Heiko Zuerker wrote on 13.05.2004 14:59 MET:
>>
>>>>Update of /cvsroot/devil-linux/build/scripts/scripts
>>>>In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14789
>>>>
>>>>Modified Files:
>>>>	postfix
>>>>Log Message:
>>>>startup script did not take care of running postmap on modified db files
>>>
>>>
>>>@Friedrich
>>>Can you please add a changelog entry for 1.0 & 1.1 ?
>>
>>Sorry, forgot that.
> 
> 
> Not a problem, that's the reason why we watch eachother. ;-)
> 

Maybe it was just a check if someone is really watching ;-)

-- 
MfG / Regards
Friedrich Lobenstock
____________________________________________________________________
Friedrich Lobenstock                       Linux Services Lobenstock
URL: http://www.lsl.at/                         Email: fl...@fl...
____________________________________________________________________

Re: [Devil-linux-develop] Re: [Devil-linux-commit] build/scripts/scripts postfix,1.3,1.4

[Heiko Z. <he...@zu...>]

> Heiko Zuerker wrote on 13.05.2004 14:59 MET:
>>>Update of /cvsroot/devil-linux/build/scripts/scripts
>>>In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14789
>>>
>>>Modified Files:
>>>	postfix
>>>Log Message:
>>>startup script did not take care of running postmap on modified db files
>>
>>
>> @Friedrich
>> Can you please add a changelog entry for 1.0 & 1.1 ?
>
> Sorry, forgot that.

Not a problem, that's the reason why we watch eachother. ;-)

-- 
Regards
  Heiko Zuerker
  http://www.devil-linux.org

Re: [Devil-linux-develop] Re: [Devil-linux-commit] build/scripts/scripts postfix,1.3,1.4

[Friedrich L. <fl...@fl...>]

Heiko Zuerker wrote on 13.05.2004 14:59 MET:
>>Update of /cvsroot/devil-linux/build/scripts/scripts
>>In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14789
>>
>>Modified Files:
>>	postfix
>>Log Message:
>>startup script did not take care of running postmap on modified db files
> 
> 
> @Friedrich
> Can you please add a changelog entry for 1.0 & 1.1 ?

Sorry, forgot that.

-- 
MfG / Regards
Friedrich Lobenstock
____________________________________________________________________
Friedrich Lobenstock                       Linux Services Lobenstock
URL: http://www.lsl.at/                         Email: fl...@fl...
____________________________________________________________________

Re: [Devil-linux-develop] THTTP problems/Questions

[Heiko Z. <he...@zu...>]

> Problem:
>
> When attempting to start THTTP, I get the following error message:
>
> Starting tHTTPd: chdir: No such file or directory
>
> I have not installed Apache.  I have noticed that under /etc/thttpd.conf
> it says that the web content should be under /var/data/http.  But that
> path does not exist.  I created it, but the error message has not gone
> away.  The event log does not tell me anything extra.
>

# This section overrides defaults
dir=/var/data//httpd
chroot
logfile=/var/log/thttpd.log
pidfile=/var/run/thttpd.pid

It should not cause a problem, but remove the duplicate / in the dir=
line. (I just corrected it in CVS).

I used it a couple month ago on my server and it worked fine.

> Question:
> Are we compiling THTTP with cgi support?

I think it's disabled currently.
Apache has it enabled, but is much bigger. If it's only a small change to
the config, then we can include it....

-- 
Regards
  Heiko Zuerker
  http://www.devil-linux.org

[Devil-linux-develop] THTTP problems/Questions

[Peter F. <pe...@em...>]

Problem:

When attempting to start THTTP, I get the following error message:

Starting tHTTPd: chdir: No such file or directory

I have not installed Apache.  I have noticed that under /etc/thttpd.conf
it says that the web content should be under /var/data/http.  But that
path does not exist.  I created it, but the error message has not gone
away.  The event log does not tell me anything extra.

--

Question:
Are we compiling THTTP with cgi support?  

-- 
Peter Frischknecht <pe...@em...>
Empowering Solutions, Inc.

[Devil-linux-develop] Re: [Devil-linux-commit] build/scripts/scripts postfix,1.3,1.4

[Heiko Z. <he...@zu...>]

> Update of /cvsroot/devil-linux/build/scripts/scripts
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14789
>
> Modified Files:
> 	postfix
> Log Message:
> startup script did not take care of running postmap on modified db files

@Friedrich
Can you please add a changelog entry for 1.0 & 1.1 ?

Thanks

-- 
Regards
  Heiko Zuerker
  http://www.devil-linux.org

Re: [Devil-linux-develop] [PATCH] To fix mount issue with mounting bootcd.iso off disk/usb drive

[Tim T. <t....@co...>]

Friedrich Lobenstock wrote:

> Tim Tait wrote on 08.05.2004 21:15 MET:
>
>> Friedrich Lobenstock wrote:
>>
>>> Tim Tait wrote on 08.05.2004 19:13 MET:
>>>
>>>> Friedrich Lobenstock wrote:
>>>>
>>>>> Why don't you change the original mount and add the options 
>>>>> "ro,noatime"
>>>>> there?
>>>>>
>>>>> Just tried it with my local CD-Rom drive to make sure iso9660 
>>>>> accepts the
>>>>> "noatime" option.
>>>>>
>>>>> # mount /dev/cdrom /mnt/ -o ro,noatime # mount | grep /mnt 
>>>>> /dev/sr0 on /mnt
>>>>> type iso9660 (ro,noatime)
>>>>
>>>> I thought that mounting it read only from the beginning would break 
>>>> the live-update feature, no?
>>>
>>> Then your patch should also break it too, shouldn't it? 
>>
>> No, because I remount it read-only after the update check is finished 
>> - ie it will have already copied bootcd.iso.new (if it exists) to 
>> bootcd.iso, and thus is ready to continue with the normal mount 
>> sequence, which only requires read access.
>
> Ok, were did I have my head.
>
>>>> Tho I suppose if is bootcd.iso.new is detected, it could be 
>>>> remounted rw at
>>>> that time.
>>>
>>> Can you please test that and add the necessary remount's there?
>>
>> I can, though it will mean 2 remounts - one to make it rw for update, 
>> then another to make ro when update is done.
>
> The current situation is using the minimal amount of mount commands.
> But for sake of cleaner implementation, meaning in the normal case we 
> don't need to run two mounts, I think the other way is better. 
> Updating is a special case anyway and were you have to take special 
> meassures anyway.

Agreed.

> How about factoring out the update stuff into another file to make the 
> mount_cdrom more readable again?

I'll let someone else make that call, but it's beginning to seem like a 
better idea...

>
> BTW while looking at the update code I think we should also 
> rename/move the /mnt/DEVIL-LINUX file so we know from which version to 
> which we are updating. Heiko!? 

it make sense they should match.

>
>> Should the new diff be done against the original, or the last patched 
>> version?  I don't see that change in CVS yet.
>
> The webinterface seems to be up to date, so you can always get the 
> file from there: 
> http://cvs.sourceforge.net/viewcvs.py/devil-linux/build/config/etc/initrd/mount_cdrom 
>

I didn't see the changes in the "cvs diff" because by default it 
compares to the revision from which you modified it, not the latest.

Hmm, but can I just use "cvs diff -D now -uN 
./config/etc/initrd/mount_cdrom" to force a diff of my version against 
the latest CVS repository? Seems easier than moving mine aside, 
updating, renaming,  and putting mine back... or going to the web to get 
it. And more foolproof.

>
> While you are at it, the "if" from before "# generate list of cdroms 
> from devfs" down should be moved down and merged with your addition of 
> "if [ "$3" != "silent" ]". Is shorter and makes the file more readable.
>
> And while your are using the "ro,noatime" mount option why not merge 
> the two for-loops into one? Like:
>
>   for disk in $CDROMS $PARTITIONS
>   do

That will change the function a bit, do we want that? I guess there is 
no harm in looking for a bootcd.iso on CDROM is there? Actually, it 
would make installing to disk easier to have the ISO image available on 
CD, as the install-on-usb script needs it. Of course for the CD to boot 
the PC, it would have to be made from the ISO... so the ISO would 
contain the ISO?... now my head hurts. I don't think that can work.

Question: Can install-on-usb make a .iso file from the CD itself easily? 
It would solve that chicken-and-egg problem.

Also, is there any way to know which is our boot device? It seems like 
that should be the 1st device in the scan list. Picture this: I upgrade 
to a bad bootcd.iso on my hard disk, so now it wont boot. So I pop in my 
USB stick, set it as the 1st boot device in the BIOS, the USB stick 
boots up... and loads the bad bootcd.iso off the hard disk... Arrggg.

We have a boot line option for which config file to use, but none to say 
which iso. I thnk this should be added to mount_cdrom like it was done 
in linuxrc for the config file. Comments?

Maybe I'm wrong but I think I found another problem with the 
auto-upgrade - we need to update the /boot/initrd.gz file as well as 
bootcd.iso ,  right? Otherwise if it was a different rev of the kernel 
the boot will blow up due to library mismatches, no?

Tim

Re: [Devil-linux-develop] RTL8169 bugs in 2.4.26

[Heiko Z. <he...@zu...>]

Tim Tait wrote:
> Tim Tait wrote:
> 
>>
>> Found this patch set for the RTL8169 for 2.4.26, no idea if it fixes 
>> the problem but I'll try it if I can figure it out...
>>
>> A couple of questions:
>> - Does DL support the "NMI" watchdog? Is that what that make 
>> menuconfig pick is supposed to do? I had it on but it didn't seem to 
>> do anyhing.
>>
>> - Where do I turn on the "magic" Alt-sysrq-T thingy? I see it being 
>> turned on if  support in the init.d/boot script, so it must no be 
>> comiled in cause the /proc... file does not exist.
>>
>> Thanks-
>>
>> Tim
>>
>> from message thread: 
>> <http://oss.sgi.com/archives/netdev/2004-04/msg00341.html>
>>
>> ----------- from 
>> <http://www.fr.zoreil.com/linux/kernel/2.4.x/2.4.26/README.txt> :
>>
>> This is an updated version of the r8169 patchset. The fix are directly
>> included in the relevant patches.
>>
>> Apply/compile/test to vanilla 2.4.26 in following order:
>>
>>              file                   |               md5
>> -------------------------------------+---------------------------------
>> r8169-upgrade-to-2.6.4-rc2.patch      b3bc23560b2c642669c4aa4fb25f3572
>> r8169-dma-api-tx.patch                a028c8710ed54d4447d9236f482b6c84
>> r8169-dma-api-rx-buffers.patch        9d242d745b5054127d7a81587fbbb18c
>> r8169-dma-api-tx-buffers.patch        7370aa7904228bbb19588b1ac18e283c
>> r8169-rx_copybreak.patch              dd0a99f3d5cbba194af9ca2fe297b801
>> r8169-mac-phy-version.patch           6430bfbbad8cb107975d61e4ffcf93a0
>> r8169-init_one.patch                  d71baaee42398f173894b08a6e130dbf
>> r8169-timer.patch                     de72e4825867f22f0b302edb985c9a02
>> r8169-hw_start.patch                  8427a73de3f1c2c72f69da81dde0c9fc
>> r8169-intr_mask.patch                 08d386707a2a67a0cddaf3d748df8ff2
>> r8169-suspend.patch                   e7832871558326cf9e1a4d8a15cacfa5
>> r8169-endianness.patch                e99ad19f62cca91e48a29f8fcd5f1ceb
>> r8169-getstats.patch                  b36929bae4b35f6bd8fb6de356eb6475
>> r8169-ethtool-introduction.patch      2323a525428cd8247e531116d7abbad0
>> r8169-missing-static.patch            ab65bb8ffcab7695663e12b5349c5fe7
>> r8169-barrier.patch                   81a6e52ff808abe0abd9678ea3ed465a
>> r8169-kill-potential-busy-loop.patch  69cdc5de2f9c45d84b2921968d035363
>> r8169-dac-10.patch                    b99a95566e141df52de6b63fc707905b
>> r8169-irq-handler-status.patch        0a5b62497984acd4185e81a14226e37b
>>
>> Each patch must be applied on top of the preceeding one: there
>> should be zero warning from the patch command. 
> 
> 
> <http://www.fr.zoreil.com/linux/kernel/2.4.x/2.4.26/r8169-blob.tar.bz2>
> 
> These patches did the trick, works like a charm at gigabit speeds now. 
> About 25% faster thoughput too than in 2.4.25 or stock 2.4.26!
> 
> I've never done a source tree patch submission before, so how does this 
> patch get rolled into DL? Should the diffs be combined into one?

We can use the patches as-is I think. I'll look into it when I get some 
more time.

Any comments anybody?

Heiko

Re: [Devil-linux-develop] RTL8169 bugs in 2.4.26

[Tim T. <t....@co...>]

Tim Tait wrote:

>
> Found this patch set for the RTL8169 for 2.4.26, no idea if it fixes 
> the problem but I'll try it if I can figure it out...
>
> A couple of questions:
> - Does DL support the "NMI" watchdog? Is that what that make 
> menuconfig pick is supposed to do? I had it on but it didn't seem to 
> do anyhing.
>
> - Where do I turn on the "magic" Alt-sysrq-T thingy? I see it being 
> turned on if  support in the init.d/boot script, so it must no be 
> comiled in cause the /proc... file does not exist.
>
> Thanks-
>
> Tim
>
> from message thread: 
> <http://oss.sgi.com/archives/netdev/2004-04/msg00341.html>
>
> ----------- from 
> <http://www.fr.zoreil.com/linux/kernel/2.4.x/2.4.26/README.txt> :
>
> This is an updated version of the r8169 patchset. The fix are directly
> included in the relevant patches.
>
> Apply/compile/test to vanilla 2.4.26 in following order:
>
>              file                   |               md5
> -------------------------------------+---------------------------------
> r8169-upgrade-to-2.6.4-rc2.patch      b3bc23560b2c642669c4aa4fb25f3572
> r8169-dma-api-tx.patch                a028c8710ed54d4447d9236f482b6c84
> r8169-dma-api-rx-buffers.patch        9d242d745b5054127d7a81587fbbb18c
> r8169-dma-api-tx-buffers.patch        7370aa7904228bbb19588b1ac18e283c
> r8169-rx_copybreak.patch              dd0a99f3d5cbba194af9ca2fe297b801
> r8169-mac-phy-version.patch           6430bfbbad8cb107975d61e4ffcf93a0
> r8169-init_one.patch                  d71baaee42398f173894b08a6e130dbf
> r8169-timer.patch                     de72e4825867f22f0b302edb985c9a02
> r8169-hw_start.patch                  8427a73de3f1c2c72f69da81dde0c9fc
> r8169-intr_mask.patch                 08d386707a2a67a0cddaf3d748df8ff2
> r8169-suspend.patch                   e7832871558326cf9e1a4d8a15cacfa5
> r8169-endianness.patch                e99ad19f62cca91e48a29f8fcd5f1ceb
> r8169-getstats.patch                  b36929bae4b35f6bd8fb6de356eb6475
> r8169-ethtool-introduction.patch      2323a525428cd8247e531116d7abbad0
> r8169-missing-static.patch            ab65bb8ffcab7695663e12b5349c5fe7
> r8169-barrier.patch                   81a6e52ff808abe0abd9678ea3ed465a
> r8169-kill-potential-busy-loop.patch  69cdc5de2f9c45d84b2921968d035363
> r8169-dac-10.patch                    b99a95566e141df52de6b63fc707905b
> r8169-irq-handler-status.patch        0a5b62497984acd4185e81a14226e37b
>
> Each patch must be applied on top of the preceeding one: there
> should be zero warning from the patch command. 

<http://www.fr.zoreil.com/linux/kernel/2.4.x/2.4.26/r8169-blob.tar.bz2>

These patches did the trick, works like a charm at gigabit speeds now. 
About 25% faster thoughput too than in 2.4.25 or stock 2.4.26!

I've never done a source tree patch submission before, so how does this 
patch get rolled into DL? Should the diffs be combined into one?

Tim

Re: [Devil-linux-develop] RTL8169 bugs in 2.4.26

[Heiko Z. <he...@zu...>]

Tim Tait wrote:
> 
> Found this patch set for the RTL8169 for 2.4.26, no idea if it fixes the 
> problem but I'll try it if I can figure it out...

So the question is: do we have to include one or more of those patches?

> A couple of questions:
> - Does DL support the "NMI" watchdog? Is that what that make menuconfig 
> pick is supposed to do? I had it on but it didn't seem to do anyhing.

NMI watchdog?
I never saw this anywhere... (but I could jus tbe blind or ignorant)

> - Where do I turn on the "magic" Alt-sysrq-T thingy? I see it being 
> turned on if  support in the init.d/boot script, so it must no be 
> comiled in cause the /proc... file does not exist.

This is for Kernel debugging, I don't really want to turn this on.

Heiko

[Devil-linux-develop] RTL8169 bugs in 2.4.26

[Tim T. <t....@co...>]

Found this patch set for the RTL8169 for 2.4.26, no idea if it fixes the 
problem but I'll try it if I can figure it out...

A couple of questions:
- Does DL support the "NMI" watchdog? Is that what that make menuconfig 
pick is supposed to do? I had it on but it didn't seem to do anyhing.

- Where do I turn on the "magic" Alt-sysrq-T thingy? I see it being 
turned on if  support in the init.d/boot script, so it must no be 
comiled in cause the /proc... file does not exist.

Thanks-

Tim

from message thread: 
<http://oss.sgi.com/archives/netdev/2004-04/msg00341.html>

----------- from 
<http://www.fr.zoreil.com/linux/kernel/2.4.x/2.4.26/README.txt> :

This is an updated version of the r8169 patchset. The fix are directly
included in the relevant patches.

Apply/compile/test to vanilla 2.4.26 in following order:

              file                   |               md5
-------------------------------------+---------------------------------
r8169-upgrade-to-2.6.4-rc2.patch      b3bc23560b2c642669c4aa4fb25f3572
r8169-dma-api-tx.patch                a028c8710ed54d4447d9236f482b6c84
r8169-dma-api-rx-buffers.patch        9d242d745b5054127d7a81587fbbb18c
r8169-dma-api-tx-buffers.patch        7370aa7904228bbb19588b1ac18e283c
r8169-rx_copybreak.patch              dd0a99f3d5cbba194af9ca2fe297b801
r8169-mac-phy-version.patch           6430bfbbad8cb107975d61e4ffcf93a0
r8169-init_one.patch                  d71baaee42398f173894b08a6e130dbf
r8169-timer.patch                     de72e4825867f22f0b302edb985c9a02
r8169-hw_start.patch                  8427a73de3f1c2c72f69da81dde0c9fc
r8169-intr_mask.patch                 08d386707a2a67a0cddaf3d748df8ff2
r8169-suspend.patch                   e7832871558326cf9e1a4d8a15cacfa5
r8169-endianness.patch                e99ad19f62cca91e48a29f8fcd5f1ceb
r8169-getstats.patch                  b36929bae4b35f6bd8fb6de356eb6475
r8169-ethtool-introduction.patch      2323a525428cd8247e531116d7abbad0
r8169-missing-static.patch            ab65bb8ffcab7695663e12b5349c5fe7
r8169-barrier.patch                   81a6e52ff808abe0abd9678ea3ed465a
r8169-kill-potential-busy-loop.patch  69cdc5de2f9c45d84b2921968d035363
r8169-dac-10.patch                    b99a95566e141df52de6b63fc707905b
r8169-irq-handler-status.patch        0a5b62497984acd4185e81a14226e37b

Each patch must be applied on top of the preceeding one: there
should be zero warning from the patch command.

If the patches do not apply cleanly, please provide an (sh-)history of
the issued commands as well as md5sum of the relevant files.

Please compile and report after each patch if the driver is stable
without/under load. A fix related to a bug under load has been merged
in recent 2.4.26-xx. It should help.

Comparisons with/without SMP support enabled in the kernel will be welcome.

If something goes wrong:
- verify that the problem disappears when the latest patch is not applied;
- send:
  - the list of applied patches ;
  - 'dmesg', 'lspci', 'lsmod', 'cat /proc/interrupts', 'ifconfig' output ;
  - a few words of explanation ;
- disable acpi if it was enabled and try again ;
- please Cc: ne...@os....

Depending on your hardware configuration (Intel + apic), you may use the
nmi watchdog if things go really scary. Enable it in the configuration menu
and include an 'nmi_watchdog=1' option on the kernel boot command-line.

The magic sysrq (alt+sysrq+t) may help too. Please check it is not disabled
in your /etc/sysctl.conf (distribution dependant ?).

Thank you for your contribution.

Re: [Devil-linux-develop] DL 1.1.4 does not boot if built with libsafe deselected

[Heiko Z. <he...@zu...>]

Tim Tait wrote:
> 
> At chroot, the kernel panics with "libsafe.so" not found.

remove /etc/ld.so.preload

Heiko

Re: [Devil-linux-develop] DL 1.1.4 does not compile with GCC Stack Smashing protector off

[Heiko Z. <he...@zu...>]

Tim Tait wrote:
> 
> I get a dependency failure during a full make. Sorry, did not save log 
> files.

Yes have to start over with a fresh lfssystem, since the one you're 
currently using is already the gcc-ssp version.

Heiko

[Devil-linux-develop] DL 1.1.4 does not boot if built with libsafe deselected

[Tim T. <t....@co...>]

At chroot, the kernel panics with "libsafe.so" not found.

Tim

[Devil-linux-develop] DL 1.1.4 does not compile with GCC Stack Smashing protector off

[Tim T. <t....@co...>]

I get a dependency failure during a full make. Sorry, did not save log 
files.

Tim

Re: [Devil-linux-develop] [PATCH] To fix mount issue with mounting bootcd.iso off disk/usb drive

[Friedrich L. <fl...@fl...>]

Heiko Zuerker wrote on 09.05.2004 01:42 MET:

> Friedrich Lobenstock wrote:
> 
>> Tim Tait wrote on 08.05.2004 21:15 MET:
>>
>>> Friedrich Lobenstock wrote:
>>>
>>>> Tim Tait wrote on 08.05.2004 19:13 MET:
>>>>
>>>>> Friedrich Lobenstock wrote:
>>>>>
>>>>>>
>>>>>> Why don't you change the original mount and add the options 
>>>>>> "ro,noatime"
>>>>>> there?
>>>>>>
>>>>>> Just tried it with my local CD-Rom drive to make sure iso9660 
>>>>>> accepts the
>>>>>> "noatime" option.
>>>>>>
>>>>>> # mount /dev/cdrom /mnt/ -o ro,noatime # mount | grep /mnt 
>>>>>> /dev/sr0 on /mnt
>>>>>> type iso9660 (ro,noatime)
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> I thought that mounting it read only from the beginning would break 
>>>>> the live-update feature, no?
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> Then your patch should also break it too, shouldn't it? 
>>>
>>>
>>>
>>> No, because I remount it read-only after the update check is finished 
>>> - ie it will have already copied bootcd.iso.new (if it exists) to 
>>> bootcd.iso, and thus is ready to continue with the normal mount 
>>> sequence, which only requires read access.
>>
>>
>>
>> Ok, were did I have my head.
>>
>>
>>>>> Tho I suppose if is bootcd.iso.new is detected, it could be 
>>>>> remounted rw at
>>>>> that time.
>>>>
>>>>
>>>>
>>>> Can you please test that and add the necessary remount's there?
>>>
>>>
>>>
>>> I can, though it will mean 2 remounts - one to make it rw for update, 
>>> then another to make ro when update is done.
>>
>>
>>
>> The current situation is using the minimal amount of mount commands.
>> But for sake of cleaner implementation, meaning in the normal case we 
>> don't need to run two mounts, I think the other way is better. 
>> Updating is a special case anyway and were you have to take special 
>> meassures anyway. How about factoring out the update stuff into 
>> another file to make the mount_cdrom more readable again?
>>
>> BTW while looking at the update code I think we should also 
>> rename/move the /mnt/DEVIL-LINUX file so we know from which version to 
>> which we are updating. Heiko!?
> 
> 
> I thought we don't need this, because when the configuration gets 
> upgraded, then the Admin sees anyway from where to where.
> On the other hand, you don't really "see" the upgrade, since the system 
> replaces the files and continues the boot process where it then replaces 
> the initrd and reboots again....

But if the file DEVIL-LINUX.old is there it is easier to check which the old 
version was later. Eg. just before the login:
    "System updated from version xy to xz"

Also think of debugging update problems.


-- 
MfG / Regards
Friedrich Lobenstock
____________________________________________________________________
Friedrich Lobenstock                       Linux Services Lobenstock
URL: http://www.lsl.at/                         Email: fl...@fl...
____________________________________________________________________

Re: [Devil-linux-develop] [PATCH] boot option docu

[Roland P. <pa...@ta...>]

On Sunday 09 May 2004 02:01, Heiko Zuerker wrote:
> Roland Pabel wrote:
> > Hi,
> > here is the patch for the documentation
>
> The patch applied fine, but when I opened the document with the Morphon
> XML editor it complained and your sample "<computeroutput>" seems to be
> messed up.
I don't know this editor, wrote it with mc...I tested it by running 'htmldoc' 
and that worked fine...could you be a little more specific about that error?
Roland
-- 
ICQ UIN 49339118	Linux Counter #88774
GPG-Key 1024D/59C6AFA6 2003-02-07 Roland Pabel <ro...@pa...>