summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--debian/changelog16
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules4
-rwxr-xr-xinit4
5 files changed, 26 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 85ce872..0ec4f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,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 4986dea..4cc989c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: initramfs-tools
Section: utils
Priority: optional
-Uploaders: Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@debian.org>, David Härdeman <david@hardeman.nu>
-Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Maintainer: Vyatta Package Maintainers <maintainers@vyatta.com>
Build-Depends: debhelper (>= 4.1.0), cdbs
Standards-Version: 3.8.0
Vcs-Browser: http://git.debian.org/?p=kernel/initramfs-tools.git
diff --git a/debian/rules b/debian/rules
index 2a5ae55..85343d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
+DEB_DH_GENCONTROL_ARGS_ALL = $(shell if [ -f "../.VYATTA_DEV_BUILD" ]; then \
+ echo "-- -v999.dev"; fi)
+
include /usr/share/cdbs/1/rules/debhelper.mk
pre-build::
+ rm -f debian/files
chmod +x init mkinitramfs
chmod +x hooks/*
for x in `find scripts/ -maxdepth 1 -type d | tail -n+2`; do \
diff --git a/init b/init
index 102eda2..ee7dd2a 100755
--- a/init
+++ b/init
@@ -180,8 +180,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
# Check init bootarg
if [ -n "${init}" ] && [ ! -x "${rootmnt}${init}" ]; then