| @@ -35,10 +35,10 if [ "$ENABLE_IPTABLES" = true ] ; then | |||||
| 35 | chroot_exec systemctl daemon-reload |
|
35 | chroot_exec systemctl daemon-reload | |
| 36 | chroot_exec systemctl enable ip6tables.service |
|
36 | chroot_exec systemctl enable ip6tables.service | |
| 37 | fi |
|
37 | fi | |
| 38 | fi |
|
38 | ||
| 39 |
|
39 | if [ "$ENABLE_SSHD" = false ] ; then | ||
| 40 | if [ "$ENABLE_SSHD" = false ] ; then |
|
40 | # Remove SSHD related iptables rules | |
| 41 | # Remove SSHD related iptables rules |
|
41 | sed -i "/^#/! {/SSH/ s/^/# /}" "${ETC_DIR}/iptables/iptables.rules" 2> /dev/null | |
| 42 | sed -i "/^#/! {/SSH/ s/^/# /}" "${ETC_DIR}/iptables/iptables.rules" 2> /dev/null |
|
42 | sed -i "/^#/! {/SSH/ s/^/# /}" "${ETC_DIR}/iptables/ip6tables.rules" 2> /dev/null | |
| 43 | sed -i "/^#/! {/SSH/ s/^/# /}" "${ETC_DIR}/iptables/ip6tables.rules" 2> /dev/null |
|
43 | fi | |
| 44 | fi |
|
44 | fi | |
| @@ -466,6 +466,10 if [ "$ENABLE_REDUCE" = true ] ; then | |||||
| 466 | fi |
|
466 | fi | |
| 467 | fi |
|
467 | fi | |
| 468 |
|
468 | |||
|
|
469 | if [ "$RELEASE" != "jessie" ] ; then | |||
|
|
470 | APT_INCLUDES="${APT_INCLUDES},libnss-systemd" | |||
|
|
471 | fi | |||
|
|
472 | ||||
| 469 | # Configure kernel sources if no KERNELSRC_DIR |
|
473 | # Configure kernel sources if no KERNELSRC_DIR | |
| 470 | if [ "$BUILD_KERNEL" = true ] && [ -z "$KERNELSRC_DIR" ] ; then |
|
474 | if [ "$BUILD_KERNEL" = true ] && [ -z "$KERNELSRC_DIR" ] ; then | |
| 471 | KERNELSRC_CONFIG=true |
|
475 | KERNELSRC_CONFIG=true | |
| @@ -552,8 +556,8 ROOT_OFFSET=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS}) | |||||
| 552 |
|
556 | |||
| 553 | # The root partition is EXT4 |
|
557 | # The root partition is EXT4 | |
| 554 | # This means more space than the actual used space of the chroot is used. |
|
558 | # This means more space than the actual used space of the chroot is used. | |
| 555 |
# As overhead for journaling and reserved blocks |
|
559 | # As overhead for journaling and reserved blocks 35% are added. | |
| 556 |
ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* |
|
560 | ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 35) \* 1024 \/ 512) | |
| 557 |
|
561 | |||
| 558 | # Calculate required image size in 512 Byte sectors |
|
562 | # Calculate required image size in 512 Byte sectors | |
| 559 | IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS}) |
|
563 | IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS}) | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
