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