summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--debian/changelog65
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules6
-rw-r--r--hook-functions13
-rwxr-xr-xinit4
6 files changed, 90 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..28bfdc8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+debian/files
+debian/initramfs-tools.debhelper.log
+debian/initramfs-tools
diff --git a/debian/changelog b/debian/changelog
index dfa3ab4..20e84b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -534,6 +534,55 @@ initramfs-tools (0.93) unstable; urgency=low
-- maximilian attems <maks@debian.org> Wed, 18 Feb 2009 19:10:23 +0100
+initramfs-tools (0.92o+vyatta+8) unstable; urgency=low
+
+ * fix for squeeze dpkg
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Fri, 03 Sep 2010 14:42:48 -0700
+
+initramfs-tools (0.92o+vyatta+7) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Thu, 02 Sep 2010 18:25:58 -0700
+
+initramfs-tools (0.92o+vyatta+6) unstable; urgency=low
+
+ * fix squeeze build
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Tue, 31 Aug 2010 16:02:47 -0700
+
+initramfs-tools (0.92o+vyatta+5) unstable; urgency=low
+
+ * Add bnx2x to network drivers
+ * Find firmware in /lib/firmware/<kernel-version>
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Thu, 26 Aug 2010 16:41:39 -0700
+
+initramfs-tools (0.92o+vyatta+4) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Thu, 22 Jul 2010 17:20:38 -0700
+
+initramfs-tools (0.92o+vyatta+3) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Wed, 17 Feb 2010 16:10:32 -0800
+
+initramfs-tools (0.92o+vyatta+2) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Fri, 29 May 2009 18:33:39 -0700
+
+initramfs-tools (0.92o+vyatta+1) unstable; urgency=low
+
+ * merge upstream 0.92o
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Fri, 10 Apr 2009 16:07:02 -0700
+
initramfs-tools (0.92o) unstable; urgency=high
* configure_networking: Raise ipconfig timeout to 180 seconds.
@@ -613,6 +662,22 @@ initramfs-tools (0.92k) unstable; urgency=high
-- maximilian attems <maks@debian.org> Tue, 16 Sep 2008 14:55:04 +0200
+initramfs-tools (0.92j+vyatta+2) unstable; urgency=low
+
+ [ rbalocca ]
+ * Ignore derived files
+ * Remove startup warnings
+ * Fix for bug http://bugzilla.vyatta.com/show_bug.cgi?id=3857
+
+ [ An-Cheng Huang ]
+ * add support for development build
+ * update maintainer information
+ * "files" file should be removed before package build
+
+ (Tag the right branch)
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Wed, 07 Jan 2009 19:01:39 -0800
+
initramfs-tools (0.92j) unstable; urgency=high
[ Gerfried Fuchs ]
diff --git a/debian/control b/debian/control
index a9d16c4..9f02a4f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: initramfs-tools
Section: utils
Priority: optional
-Uploaders: maximilian attems <maks@debian.org>, Michael Prokop <mika@debian.org>
-Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Maintainer: Vyatta Package Maintainers <maintainers@vyatta.com>
Build-Depends: debhelper (>= 7.0)
Standards-Version: 3.9.1
Vcs-Browser: http://git.debian.org/?p=kernel/initramfs-tools.git
diff --git a/debian/rules b/debian/rules
index 2d33f6a..08a2fd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,10 @@
#!/usr/bin/make -f
+DEB_DH_GENCONTROL_ARGS_ALL = $(shell if [ -f "../.VYATTA_DEV_BUILD" ]; then \
+ echo "-- -v999.dev"; fi)
+
+pre-build::
+ rm -f debian/files
+
%:
dh $@
diff --git a/hook-functions b/hook-functions
index 0684296..915d2ef 100644
--- a/hook-functions
+++ b/hook-functions
@@ -401,6 +401,19 @@ auto_add_modules()
done
;;
net)
+ for x in 3c59x 8139cp 8139too 8390 atl1 atl1e b44 bmac \
+ bnx2 bnx2x cxgb cxgb3 de2104x de4x5 defxx dl2k dmfe \
+ e100 e1000 e1000e ehea epic100 \
+ ep93xx_eth eql fealnx famachi forcedeth gelic_net \
+ hp100 igb ipg ixgb ixgbe mace mlx4_core mv643xx_eth myri10ge \
+ natsemi ne2k-pci netconsole netxen_nic niu ns83820 \
+ pcnet32 qla3xxx \
+ r8169 s2io sfc sis900 skge sky2 slhc smc911x starfire \
+ sundance sungem sungem_phy sunhme sunvnet tehuti tg3 tlan \
+ tulip typhoon via-rhine via-velocity winbond-840 \
+ xircom_cb xircom_tulip_cb yellowfin; do
+ manual_add_modules "${x}"
+ done
copy_modules_dir kernel/drivers/net \
appletalk arcnet bonding can hamradio irda pcmcia \
tokenring usb wan wimax wireless
diff --git a/init b/init
index abe3c9b..5d08138 100755
--- a/init
+++ b/init
@@ -224,8 +224,8 @@ run_scripts /scripts/init-bottom
[ "$quiet" != "y" ] && log_end_msg
# Move virtual filesystems over to the real filesystem
-mount -n -o move /sys ${rootmnt}/sys
-mount -n -o move /proc ${rootmnt}/proc
+mount -n -o move -t sysfs /sys ${rootmnt}/sys
+mount -n -o move -t proc /proc ${rootmnt}/proc
validate_init() {
checktarget="${1}"