diff options
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r-- | meta/recipes-core/base-files/base-files/fstab.systemd | 9 | ||||
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/meta/recipes-core/base-files/base-files/fstab.systemd b/meta/recipes-core/base-files/base-files/fstab.systemd deleted file mode 100644 index cb48a0de4a..0000000000 --- a/meta/recipes-core/base-files/base-files/fstab.systemd +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | # stock fstab - you probably want to override this with a machine specific one | ||
2 | |||
3 | rootfs / auto defaults 1 1 | ||
4 | tmpfs /var/volatile tmpfs defaults 0 0 | ||
5 | tmpfs /media/ram tmpfs defaults 0 0 | ||
6 | |||
7 | # uncomment this if your device has a SD/MMC/Transflash slot | ||
8 | #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 | ||
9 | |||
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index e7a9d82133..a56450dc3f 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -18,7 +18,6 @@ SRC_URI = "file://rotation \ | |||
18 | file://profile \ | 18 | file://profile \ |
19 | file://shells \ | 19 | file://shells \ |
20 | file://fstab \ | 20 | file://fstab \ |
21 | file://fstab.systemd \ | ||
22 | file://filesystems \ | 21 | file://filesystems \ |
23 | file://issue.net \ | 22 | file://issue.net \ |
24 | file://issue \ | 23 | file://issue \ |
@@ -92,11 +91,7 @@ do_install () { | |||
92 | install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation | 91 | install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation |
93 | fi | 92 | fi |
94 | 93 | ||
95 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 94 | install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab |
96 | install -m 0644 ${WORKDIR}/fstab.systemd ${D}${sysconfdir}/fstab | ||
97 | else | ||
98 | install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab | ||
99 | fi | ||
100 | install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems | 95 | install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems |
101 | install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd | 96 | install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd |
102 | sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile | 97 | sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile |