[augeas-devel] [PATCH 1/4] Test root: mimick the setup of grub config files on Fedora more closely

[lutter at redhat.com]

From: David Lutterkort <lutter at redhat.com>

  * root/etc/grub.conf: symlink to root/boot/grub/grub.conf
  * root/boot/grub/grub.conf: new file with contents of /etc/grub.conf
  * root/boot/grub/menu.lst: symlink to grub.conf
---
 tests/root/boot/grub/grub.conf |   31 +++++++++++++++++++++++++++++++
 tests/root/boot/grub/menu.lst  |    1 +
 tests/root/etc/grub.conf       |   32 +-------------------------------
 3 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 tests/root/boot/grub/grub.conf
 create mode 120000 tests/root/boot/grub/menu.lst
 mode change 100644 => 120000 tests/root/etc/grub.conf

diff --git a/tests/root/boot/grub/grub.conf b/tests/root/boot/grub/grub.conf
new file mode 100644
index 0000000..adb02f5
--- /dev/null
+++ b/tests/root/boot/grub/grub.conf
@@ -0,0 +1,31 @@
+# grub.conf generated by anaconda
+#
+# Note that you do not have to rerun grub after making changes to this file
+# NOTICE:  You have a /boot partition.  This means that
+#          all kernel and initrd paths are relative to /boot/, eg.
+#          root (hd0,0)
+#          kernel /vmlinuz-version ro root=/dev/vg00/lv00
+#          initrd /initrd-version.img
+#boot=/dev/sda
+default=0
+timeout=5
+splashimage=(hd0,0)/grub/splash.xpm.gz
+hiddenmenu
+title Fedora (2.6.24.4-64.fc8)
+	root (hd0,0)
+	kernel /vmlinuz-2.6.24.4-64.fc8 ro root=/dev/vg00/lv00
+	initrd /initrd-2.6.24.4-64.fc8.img
+title Fedora (2.6.24.3-50.fc8)
+	root (hd0,0)
+	kernel /vmlinuz-2.6.24.3-50.fc8 ro root=/dev/vg00/lv00
+	initrd /initrd-2.6.24.3-50.fc8.img
+title Fedora (2.6.21.7-3.fc8xen)
+	root (hd0,0)
+	kernel /xen.gz-2.6.21.7-3.fc8
+	module /vmlinuz-2.6.21.7-3.fc8xen ro root=/dev/vg00/lv00
+	module /initrd-2.6.21.7-3.fc8xen.img
+title Fedora (2.6.24.3-34.fc8)
+	root (hd0,0)
+	kernel /vmlinuz-2.6.24.3-34.fc8 ro root=/dev/vg00/lv00
+	initrd /initrd-2.6.24.3-34.fc8.img
+        savedefault
diff --git a/tests/root/boot/grub/menu.lst b/tests/root/boot/grub/menu.lst
new file mode 120000
index 0000000..26b9e1d
--- /dev/null
+++ b/tests/root/boot/grub/menu.lst
@@ -0,0 +1 @@
+grub.conf
\ No newline at end of file
diff --git a/tests/root/etc/grub.conf b/tests/root/etc/grub.conf
deleted file mode 100644
index adb02f5..0000000
--- a/tests/root/etc/grub.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# grub.conf generated by anaconda
-#
-# Note that you do not have to rerun grub after making changes to this file
-# NOTICE:  You have a /boot partition.  This means that
-#          all kernel and initrd paths are relative to /boot/, eg.
-#          root (hd0,0)
-#          kernel /vmlinuz-version ro root=/dev/vg00/lv00
-#          initrd /initrd-version.img
-#boot=/dev/sda
-default=0
-timeout=5
-splashimage=(hd0,0)/grub/splash.xpm.gz
-hiddenmenu
-title Fedora (2.6.24.4-64.fc8)
-	root (hd0,0)
-	kernel /vmlinuz-2.6.24.4-64.fc8 ro root=/dev/vg00/lv00
-	initrd /initrd-2.6.24.4-64.fc8.img
-title Fedora (2.6.24.3-50.fc8)
-	root (hd0,0)
-	kernel /vmlinuz-2.6.24.3-50.fc8 ro root=/dev/vg00/lv00
-	initrd /initrd-2.6.24.3-50.fc8.img
-title Fedora (2.6.21.7-3.fc8xen)
-	root (hd0,0)
-	kernel /xen.gz-2.6.21.7-3.fc8
-	module /vmlinuz-2.6.21.7-3.fc8xen ro root=/dev/vg00/lv00
-	module /initrd-2.6.21.7-3.fc8xen.img
-title Fedora (2.6.24.3-34.fc8)
-	root (hd0,0)
-	kernel /vmlinuz-2.6.24.3-34.fc8 ro root=/dev/vg00/lv00
-	initrd /initrd-2.6.24.3-34.fc8.img
-        savedefault
diff --git a/tests/root/etc/grub.conf b/tests/root/etc/grub.conf
new file mode 120000
index 0000000..2d258ce
--- /dev/null
+++ b/tests/root/etc/grub.conf
@@ -0,0 +1 @@
+../boot/grub/grub.conf
\ No newline at end of file
-- 
1.7.2