| @@ -176,7 +176,7 if [ "$BUILD_KERNEL" = true ] ; then | |||
|
|
176 | 176 | mkdir "${BOOT_DIR}" |
|
|
177 | 177 | |
|
|
178 | 178 | # Get kernel release version |
|
|
179 |
KERNEL_VERSION= |
|
|
|
179 | KERNEL_VERSION=$(cat "${KERNEL_DIR}/include/config/kernel.release") | |
|
|
180 | 180 | |
|
|
181 | 181 | # Copy kernel configuration file to the boot directory |
|
|
182 | 182 | install_readonly "${KERNEL_DIR}/.config" "${R}/boot/config-${KERNEL_VERSION}" |
| @@ -9,10 +9,11 if [ "$ENABLE_IPTABLES" = true ] ; then | |||
|
|
9 | 9 | # Create iptables configuration directory |
|
|
10 | 10 | mkdir -p "${ETC_DIR}/iptables" |
|
|
11 | 11 | |
|
|
12 |
# make sure iptables-legacy |
|
|
|
12 | # make sure iptables-legacy is the used alternatives | |
|
|
13 | #iptables-save and -restore are slaves of iptables and thus are set accordingly | |
|
|
14 | if ! [ "$RELEASE" = jessie ] ; then | |
|
|
13 | 15 |
|
|
|
14 | chroot_exec update-alternatives --verbose --set iptables-save /usr/sbin/iptables-legacy-save | |
|
|
15 | chroot_exec update-alternatives --verbose --set iptables-restore /usr/sbin/iptables-legacy-restore | |
|
|
16 | fi | |
|
|
16 | 17 | |
|
|
17 | 18 | # Install iptables systemd service |
|
|
18 | 19 | install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service" |
| @@ -6,8 +6,8 | |||
|
|
6 | 6 | . ./functions.sh |
|
|
7 | 7 | |
|
|
8 | 8 | # Generate crypt(3) password string |
|
|
9 |
ENCRYPTED_PASSWORD= |
|
|
|
10 |
ENCRYPTED_USER_PASSWORD= |
|
|
|
9 | ENCRYPTED_PASSWORD=$(mkpasswd -m sha-512 "${PASSWORD}") | |
|
|
10 | ENCRYPTED_USER_PASSWORD=$(mkpasswd -m sha-512 "${USER_PASSWORD}") | |
|
|
11 | 11 | |
|
|
12 | 12 | # Setup default user |
|
|
13 | 13 | if [ "$ENABLE_USER" = true ] ; then |
| @@ -28,7 +28,7 if [ "$ENABLE_SSHD" = true ] ; then | |||
|
|
28 | 28 | fi |
|
|
29 | 29 | |
|
|
30 | 30 | # Add SSH (v2) public key for user root |
|
|
31 |
if [ |
|
|
|
31 | if [ -n "$SSH_ROOT_PUB_KEY" ] ; then | |
|
|
32 | 32 | # Create root SSH config directory |
|
|
33 | 33 | mkdir -p "${R}/root/.ssh" |
|
|
34 | 34 | |
| @@ -52,20 +52,20 if [ "$ENABLE_SSHD" = true ] ; then | |||
|
|
52 | 52 | |
|
|
53 | 53 | if [ "$ENABLE_USER" = true ] ; then |
|
|
54 | 54 | # Add SSH (v2) public key for user $USER_NAME |
|
|
55 |
if [ |
|
|
|
55 | if [ -n "$SSH_USER_PUB_KEY" ] ; then | |
|
|
56 | 56 | # Create $USER_NAME SSH config directory |
|
|
57 | 57 | mkdir -p "${R}/home/${USER_NAME}/.ssh" |
|
|
58 | 58 | |
|
|
59 | 59 | # Set permissions of $USER_NAME SSH config directory |
|
|
60 | 60 | chroot_exec chmod 700 "/home/${USER_NAME}/.ssh" |
|
|
61 | chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh" | |
|
|
61 | chroot_exec chown "${USER_NAME}":"${USER_NAME}" "/home/${USER_NAME}/.ssh" | |
|
|
62 | 62 | |
|
|
63 | 63 | # Add SSH (v2) public key(s) to authorized_keys file |
|
|
64 | 64 | cat "$SSH_USER_PUB_KEY" >> "${R}/home/${USER_NAME}/.ssh/authorized_keys" |
|
|
65 | 65 | |
|
|
66 | 66 | # Set permissions of $USER_NAME SSH config directory |
|
|
67 | 67 | chroot_exec chmod 600 "/home/${USER_NAME}/.ssh/authorized_keys" |
|
|
68 | chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh/authorized_keys" | |
|
|
68 | chroot_exec chown "${USER_NAME}":"${USER_NAME}" "/home/${USER_NAME}/.ssh/authorized_keys" | |
|
|
69 | 69 | |
|
|
70 | 70 | if [ "$ENABLE_REDUCE" = false ] || [ "$REDUCE_SSHD" = false ] ; then |
|
|
71 | 71 | # Allow SSH public key authentication |
| @@ -85,7 +85,7 if [ "$ENABLE_SSHD" = true ] ; then | |||
|
|
85 | 85 | allowed_users="${allowed_users} ${USER_NAME}" |
|
|
86 | 86 | fi |
|
|
87 | 87 | |
|
|
88 |
if [ |
|
|
|
88 | if [ -n "$allowed_users" ] ; then | |
|
|
89 | 89 | echo "AllowUsers ${allowed_users}" >> "${ETC_DIR}/ssh/sshd_config" |
|
|
90 | 90 | fi |
|
|
91 | 91 | fi |
| @@ -32,7 +32,7 if [ "$ENABLE_UBOOT" = true ] ; then | |||
|
|
32 | 32 | fi |
|
|
33 | 33 | |
|
|
34 | 34 | # Build and install U-Boot inside chroot |
|
|
35 | chroot_exec make -j${KERNEL_THREADS} -C /tmp/u-boot/ ${UBOOT_CONFIG} all | |
|
|
35 | chroot_exec make -j"${KERNEL_THREADS}" -C /tmp/u-boot/ "${UBOOT_CONFIG}" all | |
|
|
36 | 36 | |
|
|
37 | 37 | # Copy compiled bootloader binary and set config.txt to load it |
|
|
38 | 38 | install_exec "${R}/tmp/u-boot/tools/mkimage" "${R}/usr/sbin/mkimage" |
| @@ -25,8 +25,8 if [ "$ENABLE_REDUCE" = true ] ; then | |||
|
|
25 | 25 | |
|
|
26 | 26 | # Remove all doc files |
|
|
27 | 27 | if [ "$REDUCE_DOC" = true ] ; then |
|
|
28 | find "${R}/usr/share/doc" -depth -type f ! -name copyright | xargs rm || true | |
|
|
29 | find "${R}/usr/share/doc" -empty | xargs rmdir || true | |
|
|
28 | find "${R}/usr/share/doc" -depth -type f ! -name copyright -print0 | xargs -0 rm || true | |
|
|
29 | find "${R}/usr/share/doc" -empty -print0 | xargs -0 rmdir || true | |
|
|
30 | 30 | fi |
|
|
31 | 31 | |
|
|
32 | 32 | # Remove all man pages and info files |
| @@ -36,7 +36,7 if [ "$ENABLE_REDUCE" = true ] ; then | |||
|
|
36 | 36 | |
|
|
37 | 37 | # Remove all locale translation files |
|
|
38 | 38 | if [ "$REDUCE_LOCALE" = true ] ; then |
|
|
39 | find "${R}/usr/share/locale" -mindepth 1 -maxdepth 1 ! -name 'en' | xargs rm -r | |
|
|
39 | find "${R}/usr/share/locale" -mindepth 1 -maxdepth 1 ! -name 'en' -print0 | xargs -0 rm -r | |
|
|
40 | 40 | fi |
|
|
41 | 41 | |
|
|
42 | 42 | # Remove hwdb PCI device classes (experimental) |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
