summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2005-09-20 12:39:37 +0200
committermaximilian attems <maks@debian.org>2005-09-20 12:39:37 +0200
commit21555c3e52c0165aa081aec15de5ac4eba3b23fc (patch)
tree24eaa95a9da0705ecf0a817d30ce60a416076af5
parentd88210509bcd6e79ab77c062ce57d99380d55718 (diff)
downloadinitramfs-tools-21555c3e52c0165aa081aec15de5ac4eba3b23fc.tar.gz
initramfs-tools-21555c3e52c0165aa081aec15de5ac4eba3b23fc.zip
reoder initramfs.conf
-rw-r--r--conf/initramfs.conf38
-rw-r--r--debian/changelog2
2 files changed, 24 insertions, 16 deletions
diff --git a/conf/initramfs.conf b/conf/initramfs.conf
index f1b0151..88728b4 100644
--- a/conf/initramfs.conf
+++ b/conf/initramfs.conf
@@ -1,18 +1,9 @@
#
# initramfs.conf
+# Configuration file for mkinitramfs(8). See mkinitramfs.conf(5).
#
#
-# BOOT: [ local | nfs ]
-#
-# local - Boot off of local media (harddrive, USB stick).
-#
-# nfs - Boot using an NFS drive as the root of the drive.
-#
-
-BOOT=local
-
-#
# MODULES: [ most | dep | list ]
#
# most - Add all framebuffer, acpi, filesystem, and harddrive drivers.
@@ -21,16 +12,36 @@ BOOT=local
#
# list - Only include modules from the 'additional modules' list
#
+
MODULES=most
#
+# RESUME: [ /dev/hda2 | /dev/sdb2 ]
+#
+# Optionaly set the swap partition to resume from.
+# Above are only possible example please costumize.
+# The command line of your boot loader will override this setting.
+
+#RESUME=
+
+#
# NFS Section of the config.
#
#
+# BOOT: [ local | nfs ]
+#
+# local - Boot off of local media (harddrive, USB stick).
+#
+# nfs - Boot using an NFS drive as the root of the drive.
+#
+
+BOOT=local
+
+#
# DEVICE: ...
#
-# Specify the network device, like eth0
+# Specify the network interface, like eth0
#
DEVICE=eth0
@@ -41,8 +52,3 @@ DEVICE=eth0
NFSROOT=auto
-# Hardcode partition to resume from so it doesn't have to be specified
-# on the command line. The command line will override this setting.
-
-#RESUME=
-
diff --git a/debian/changelog b/debian/changelog
index 440bb81..33108a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ initramfs-tools (0.27) unstable; urgency=low
* Fix busybox dependency to the relevant debian package.
+ * Reorder the initramfs.conf variables.
+
-- maximilian attems <maks@sternwelten.at> Mon, 19 Sep 2005 18:14:59 +0200
initramfs-tools (0.26) breezy; urgency=low