diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-08-01 16:27:43 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-08-02 11:23:03 -0700 |
| commit | d3ae34eec2d312410da6cc1dd1c6fb85e8259261 (patch) | |
| tree | 3f827986a0f5c4865d33b05001b2c59601208b76 /meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch | |
| parent | 78de74100807303fe304ea0f088317d2aa0be917 (diff) | |
| download | meta-openembedded-d3ae34eec2d312410da6cc1dd1c6fb85e8259261.tar.gz | |
python3-blivet: 2.2.0 -> 3.0.1
- Drop 0004-Mount-var-volatile-during-install.patch and
0005-update-fstab-by-appending.patch
which are moved to python3-anaconda 28.22.11
- Drop 0013-Revert-Adapt-to-logging-module-name-change.patch
whichis obsolete
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch')
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch deleted file mode 100644 index cb837e2863..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | From c3959bd00665e24a955bbdbea1ef555e76372f12 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Mon, 8 May 2017 16:25:16 +0800 | ||
| 4 | Subject: [PATCH 04/13] Mount /var/volatile during install | ||
| 5 | |||
| 6 | The installed system needs /var/volatile clean, otherwise it | ||
| 7 | caused systemd's journalctl failed to record boot log. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe specific] | ||
| 10 | |||
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 12 | --- | ||
| 13 | blivet/osinstall.py | 9 +++++++++ | ||
| 14 | 1 file changed, 9 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/blivet/osinstall.py b/blivet/osinstall.py | ||
| 17 | index a4f9535..61819c2 100644 | ||
| 18 | --- a/blivet/osinstall.py | ||
| 19 | +++ b/blivet/osinstall.py | ||
| 20 | @@ -294,6 +294,7 @@ class FSSet(object): | ||
| 21 | self._sysfs = None | ||
| 22 | self._proc = None | ||
| 23 | self._devshm = None | ||
| 24 | + self._volatile = None | ||
| 25 | self._usb = None | ||
| 26 | self._selinux = None | ||
| 27 | self._run = None | ||
| 28 | @@ -335,6 +336,12 @@ class FSSet(object): | ||
| 29 | return self._devshm | ||
| 30 | |||
| 31 | @property | ||
| 32 | + def volatile(self): | ||
| 33 | + if not self._volatile: | ||
| 34 | + self._volatile = NoDevice(fmt=get_format("tmpfs", device="tmpfs", mountpoint="/var/volatile")) | ||
| 35 | + return self._volatile | ||
| 36 | + | ||
| 37 | + @property | ||
| 38 | def usb(self): | ||
| 39 | if not self._usb: | ||
| 40 | self._usb = NoDevice(fmt=get_format("usbfs", device="usbfs", mountpoint="/proc/bus/usb")) | ||
| 41 | @@ -591,6 +598,7 @@ class FSSet(object): | ||
| 42 | |||
| 43 | devices = list(self.mountpoints.values()) + self.swap_devices | ||
| 44 | devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, | ||
| 45 | + self.volatile, | ||
| 46 | self.proc, self.selinux, self.usb, self.run]) | ||
| 47 | if isinstance(_platform, EFI): | ||
| 48 | devices.append(self.efivars) | ||
| 49 | @@ -650,6 +658,7 @@ class FSSet(object): | ||
| 50 | """ unmount filesystems, except swap if swapoff == False """ | ||
| 51 | devices = list(self.mountpoints.values()) + self.swap_devices | ||
| 52 | devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, | ||
| 53 | + self.volatile, | ||
| 54 | self.proc, self.usb, self.selinux, self.run]) | ||
| 55 | if isinstance(_platform, EFI): | ||
| 56 | devices.append(self.efivars) | ||
| 57 | -- | ||
| 58 | 2.7.4 | ||
| 59 | |||
