proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-20 20:04:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop Accept-mountall-specific-fstab-options.patch

Browse Source 
Replaced with systemd.postinst migration code in Ubuntu.
This commit is contained in:
Martin Pitt 2015-06-23 10:59:21 +02:00
parent f264323c54
commit 8fbf6c7e67
4 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -32,6 +32,8 @@ systemd (221-1) UNRELEASED; urgency=medium
* debian/rules: Fix paths in manpages as we don't currently have a merged
/usr in Debian but have most systemd things in /lib. This replaces the
previous huge and maintenance-intense patch.
* Drop Accept-mountall-specific-fstab-options.patch. Replaced with
systemd.postinst migration code in Ubuntu.
-- Michael Biebl <biebl@debian.org> Thu, 18 Jun 2015 15:37:54 +0200

29
debian/patches/Accept-mountall-specific-fstab-options.patch vendored
View File

@ -1,29 +0,0 @@
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 9 Jan 2015 17:54:09 +0100
Subject: Accept mountall specific fstab options
mountall understands four new fstab options which we need to handle for
backwards compatibility:
bootwait: That's the systemd default anyway, so can be ignored.
nobootwait, optional: Aliases for the standard util-linux "nofail" (why?!)
showthrough: Irrelevant, there is on ordering attached to fstab.
---
src/fstab-generator/fstab-generator.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index a88b68e..e8373dd 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -441,7 +441,9 @@ static int parse_fstab(bool initrd) {
path_kill_slashes(where);
noauto = fstab_test_yes_no_option(me->mnt_opts, "noauto\0" "auto\0");
- nofail = fstab_test_yes_no_option(me->mnt_opts, "nofail\0" "fail\0");
+ nofail = fstab_test_yes_no_option(me->mnt_opts, "nofail\0" "fail\0") ||
+ fstab_test_yes_no_option(me->mnt_opts, "nobootwait\0" "bootwait\0") ||
+ fstab_test_option(me->mnt_opts, "optional\0");
log_debug("Found entry what=%s where=%s type=%s nofail=%s noauto=%s",
what, where, me->mnt_type,
yes_no(noauto), yes_no(nofail));

2
debian/patches/Skip-filesystem-check-if-already-done-by-the-initram.patch vendored
View File

@ -12,7 +12,7 @@ Closes: #782522
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index e8373dd..774f23d 100644
index a88b68e..5329233 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -130,10 +130,12 @@ static bool mount_is_network(struct mntent *me) {

1
debian/patches/series vendored
View File

@ -28,7 +28,6 @@ Re-enable-journal-forwarding-to-syslog.patch
Disable-tests-which-fail-on-buildds.patch
Make-sd_login_monitor_new-work-for-logind-without-sy.patch
Don-t-enable-audit-by-default.patch
Accept-mountall-specific-fstab-options.patch
Fix-usr-remount-failure-for-split-usr.patch
util-Add-hidden-suffixes-for-ucf.patch
Drop-rc-local-generator.patch