[Lunar-commits] <lunar-iso> Use dracut with LABEL

[Peter de Ridder]

commit d92a0071226bf316bfd430beef7fee4b6b3ba590
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sun, 30 Dec 2012 09:19:13 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/d92a0071226bf316bfd430beef7fee4b6b3ba590

Use dracut with LABEL
---
  conf/modules.exclude                          | +1/-1     
  isolinux/isolinux.cfg.i686                    | +1/-1     
  isolinux/isolinux.cfg.x86_64                  | +1/-1     
  template/etc/dracut.conf.d/02-lunar-live.conf | +2/-0     
  4 files changed, 5 insertions(+), 3 deletions(-)

--- a/conf/modules.exclude
+++ b/conf/modules.exclude
@@ -1 +1 @@
-EXCLUDE_MODULES=theedge udev
+EXCLUDE_MODULES=ppl theedge udev setserial
--- a/isolinux/isolinux.cfg.i686
+++ b/isolinux/isolinux.cfg.i686
@@ -14,7 +14,7 @@ F8 f1.txt
 F9 f1.txt
 LABEL install
 	KERNEL linux
-	APPEND ro initrd=initrd root=/dev/sr0 readonlyroot rootdelay=10 vga=ask
+	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 vga=ask
 LABEL linux
 	KERNEL linux
 	APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask
--- a/isolinux/isolinux.cfg.x86_64
+++ b/isolinux/isolinux.cfg.x86_64
@@ -14,7 +14,7 @@ F8 f1.txt
 F9 f1.txt
 LABEL install
 	KERNEL linux
-	APPEND ro initrd=initrd root=/dev/sr0 readonlyroot rootdelay=10 vga=ask
+	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 vga=ask
 LABEL linux
 	KERNEL linux
 	APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask
--- /dev/null
+++ b/template/etc/dracut.conf.d/02-lunar-live.conf
@@ -0,0 +1,2 @@
+# Dracut config file for Lunar Linux CD
+add_dracutmodules+=" lunar-live "