Merge branch 'master' of https://github.com/RPi-Distro/pi-gen into dev

This commit is contained in:
Yossi
2018-04-08 13:20:09 +03:00
38 changed files with 539 additions and 222 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
#!/bin/bash -e
install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/
install -m 644 files/config.txt ${ROOTFS_DIR}/boot/
install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/"
install -m 644 files/config.txt "${ROOTFS_DIR}/boot/"
+3 -4
View File
@@ -1,9 +1,8 @@
#!/bin/bash -e
install -d ${ROOTFS_DIR}/etc/systemd/system/[email protected]
install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/[email protected]/noclear.conf
install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd?
install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab
install -d "${ROOTFS_DIR}/etc/systemd/system/[email protected]"
install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/[email protected]/noclear.conf"
install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"
on_chroot << EOF
if ! id -u pi >/dev/null 2>&1; then
-3
View File
@@ -1,3 +0,0 @@
#!/bin/sh
exit 101
+3 -3
View File
@@ -1,6 +1,6 @@
#!/bin/bash -e
install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf
install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname
install -m 644 files/ipv6.conf "${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf"
install -m 644 files/hostname "${ROOTFS_DIR}/etc/hostname"
ln -sf /dev/null ${ROOTFS_DIR}/etc/systemd/network/99-default.link
ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link"
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/bash -e
if [ ! -d ${ROOTFS_DIR} ]; then
if [ ! -d "${ROOTFS_DIR}" ]; then
copy_previous
fi