diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2009-04-10 16:01:23 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2009-04-10 16:01:23 -0700 |
| commit | e557e8a53145506bd95cd37c5e672169ad85b23a (patch) | |
| tree | dcaa330a658e7c06f2766845cbc5dfbeaea2de24 /conf | |
| parent | 2e53aeece24d032eb852d6c784d17081c821e268 (diff) | |
| parent | b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb (diff) | |
| download | initramfs-tools-e557e8a53145506bd95cd37c5e672169ad85b23a.tar.gz initramfs-tools-e557e8a53145506bd95cd37c5e672169ad85b23a.zip | |
Merge branch 'upstream' into jenner
Conflicts:
debian/changelog
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/initramfs.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/initramfs.conf b/conf/initramfs.conf index 4a89a89..a2bd8db 100644 --- a/conf/initramfs.conf +++ b/conf/initramfs.conf @@ -4,8 +4,6 @@ # # Note that configuration options from this file can be overriden # by config files in the /etc/initramfs-tools/conf.d directory. -# In particular, Debian installer may set MODULES in the file -# /etc/initramfs-tools/conf.d/driver-policy. # # MODULES: [ most | netboot | dep | list ] |