From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 25 Jul 2010 20:48:28 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into dracut
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~146
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d8a04a20550a55f5ec071f54d689a6197dd2aa50;hp=-c

Merge remote branch 'origin/master' into dracut

Conflicts:
	lfs/dracut
---

d8a04a20550a55f5ec071f54d689a6197dd2aa50
diff --combined src/install+setup/install/main.c
index bfd499c60c,9cf1bd5e37..2de12bd414
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@@ -512,15 -512,37 +512,15 @@@ int main(int argc, char *argv[]
  
  	replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
  
 -	/* Build the emergency ramdisk with all drivers */
 -	mysystem("cp -f /harddisk/etc/mkinitcpio.conf /harddisk/etc/mkinitcpio.conf.org");
 -
 -	replace("/harddisk/etc/mkinitcpio.conf", " autodetect ", " ");
 -	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-emergency.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
 -	runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 -
 -	mysystem("cp -f /harddisk/etc/mkinitcpio.conf.org /harddisk/etc/mkinitcpio.conf");
 -
 -	/* mkinitcpio has a problem if ide and pata are included */
 -	if ( scsi_disk==1 ) {
 -	    /* Remove the ide hook if we install sda */
 -	    replace("/harddisk/etc/mkinitcpio.conf", " ide ", " ");
 -	} else {
 -	    /* Remove the pata & sata hook if we install hda */
 -	    replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
 -	    replace("/harddisk/etc/mkinitcpio.conf", " sata ", " ");
 -	}
  	/* Going to make our initrd... */
 -	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
 -	runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 -/*	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
 +	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
  	runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 -*/
 -
  
  	sprintf(string, "root=%s3", hdparams.devnode_part_run);
  	replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
  	mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
  
- 	system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
+ 	system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
  
  	snprintf(commandstring, STRING_SIZE, 
  		 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);