Merge remote branch 'origin/master' into dracut

Conflicts:
	lfs/dracut
This commit is contained in:
Michael Tremer
2010-07-25 22:48:28 +02:00
13 changed files with 266 additions and 34 deletions

View File

@@ -520,7 +520,7 @@ int main(int argc, char *argv[])
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);