aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2003-11-08 21:51:05 +0000
committerdancer <dancer>2003-11-08 21:51:05 +0000
commita6703e8f7cf1846b7d5386ffecb44d864c9648bd (patch)
tree115cdc3b026829c38fad1fbe58732953bd3e96e7
parent9e39c0aefe70839d48419572b5807afdfbfd1a7e (diff)
downloadpbuilder-a6703e8f7cf1846b7d5386ffecb44d864c9648bd.tar
pbuilder-a6703e8f7cf1846b7d5386ffecb44d864c9648bd.tar.gz
change slightly.
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog2
-rwxr-xr-xpbuilder-user-mode-linux3
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bf9990..164cf80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-09 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-user-mode-linux: Do no hard-fail if I fail to fsck;
+ fsck isn't really a requirement.
+
2003-11-08 Junichi Uekawa <dancer@debian.org>
* pbuilder-user-mode-linux: add fsck
diff --git a/debian/changelog b/debian/changelog
index f44b18c..34d15c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
pbuilder (0.94) UNRELEASED; urgency=low
* pdebuild-user-mode-linux: support --configfile as pdebuild does.
- * fsck before mount, in pbuilder-user-mode-linux
+ * [UML] pbuilder-user-mode-linux; fsck before mount.
-- Junichi Uekawa <dancer@debian.org> Thu, 6 Nov 2003 07:18:31 +0900
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 35eabbb..623c39d 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -65,8 +65,7 @@ ${UML_DEBUGMODE}
mount -t proc /proc /proc
mount -t tmpfs /tmp /tmp
if ! fsck /dev/ubd/1; then
- echo "E: Failed to fsck /dev/ubd/1"
- exit 1
+ echo "W: Failed to fsck /dev/ubd/1"
fi
if ! mount -t ext2 /dev/ubd/1 ${UML_CHROOT_MOUNTPOINT}; then
echo "E: Cannot mount /dev/ubd/1, is UML root image accessible as current user?"