@@ -123,7 +123,7 mkdir -p $R | |||||
123 |
|
123 | |||
124 | # Add required packages for the minbase installation |
|
124 | # Add required packages for the minbase installation | |
125 | if [ "$ENABLE_MINBASE" = true ] ; then |
|
125 | if [ "$ENABLE_MINBASE" = true ] ; then | |
126 | APT_INCLUDES="${APT_INCLUDES},vim-tiny,net-tools" |
|
126 | APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools" | |
127 | else |
|
127 | else | |
128 | APT_INCLUDES="${APT_INCLUDES},locales" |
|
128 | APT_INCLUDES="${APT_INCLUDES},locales" | |
129 | fi |
|
129 | fi | |
@@ -133,6 +133,11 if [ "$ENABLE_DBUS" = true ] ; then | |||||
133 | APT_INCLUDES="${APT_INCLUDES},dbus" |
|
133 | APT_INCLUDES="${APT_INCLUDES},dbus" | |
134 | fi |
|
134 | fi | |
135 |
|
135 | |||
|
136 | # Add iptables IPv4/IPv6 package | |||
|
137 | if [ "$ENABLE_IPTABLES" = true ] ; then | |||
|
138 | APT_INCLUDES="${APT_INCLUDES},iptables" | |||
|
139 | fi | |||
|
140 | ||||
136 | # Add openssh server package |
|
141 | # Add openssh server package | |
137 | if [ "$ENABLE_SSHD" = true ] ; then |
|
142 | if [ "$ENABLE_SSHD" = true ] ; then | |
138 | APT_INCLUDES="${APT_INCLUDES},openssh-server" |
|
143 | APT_INCLUDES="${APT_INCLUDES},openssh-server" | |
@@ -143,14 +148,17 if [ "$ENABLE_HWRANDOM" = true ] ; then | |||||
143 | APT_INCLUDES="${APT_INCLUDES},rng-tools" |
|
148 | APT_INCLUDES="${APT_INCLUDES},rng-tools" | |
144 | fi |
|
149 | fi | |
145 |
|
150 | |||
146 | # Add xorg package |
|
|||
147 | if [ "$ENABLE_XORG" = true ] ; then |
|
|||
148 | APT_INCLUDES="${APT_INCLUDES},xorg" |
|
|||
149 | fi |
|
|||
150 |
|
||||
151 | # Add fluxbox package with eterm |
|
151 | # Add fluxbox package with eterm | |
152 | if [ "$ENABLE_FLUXBOX" = true ] ; then |
|
152 | if [ "$ENABLE_FLUXBOX" = true ] ; then | |
153 | APT_INCLUDES="${APT_INCLUDES},fluxbox,eterm" |
|
153 | APT_INCLUDES="${APT_INCLUDES},fluxbox,eterm" | |
|
154 | ||||
|
155 | # Enable xorg package dependency | |||
|
156 | ENABLE_XORG=true | |||
|
157 | fi | |||
|
158 | ||||
|
159 | # Add xorg package | |||
|
160 | if [ "$ENABLE_XORG" = true ] ; then | |||
|
161 | APT_INCLUDES="${APT_INCLUDES},xorg" | |||
154 | fi |
|
162 | fi | |
155 |
|
163 | |||
156 | # Set empty proxy string |
|
164 | # Set empty proxy string | |
@@ -293,7 +301,7 if [ "$ENABLE_CONSOLE" = true ] ; then | |||||
293 | CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200" |
|
301 | CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200" | |
294 | fi |
|
302 | fi | |
295 |
|
303 | |||
296 | # Set up ipv6 support (if requested) |
|
304 | # Set up IPv6 networking support | |
297 | if [ "$ENABLE_IPV6" = false ] ; then |
|
305 | if [ "$ENABLE_IPV6" = false ] ; then | |
298 | CMDLINE="${CMDLINE} ipv6.disable=1" |
|
306 | CMDLINE="${CMDLINE} ipv6.disable=1" | |
299 | fi |
|
307 | fi | |
@@ -658,10 +666,15 EOM | |||||
658 | # Reload systemd configuration and enable iptables service |
|
666 | # Reload systemd configuration and enable iptables service | |
659 | LANG=C chroot $R systemctl daemon-reload |
|
667 | LANG=C chroot $R systemctl daemon-reload | |
660 | LANG=C chroot $R systemctl enable ip6tables.service |
|
668 | LANG=C chroot $R systemctl enable ip6tables.service | |
661 |
|
||||
662 | fi |
|
669 | fi | |
663 | fi |
|
670 | fi | |
664 |
|
671 | |||
|
672 | # Remove SSHD related iptables rules | |||
|
673 | if [ "$ENABLE_SSHD" = false ] ; then | |||
|
674 | sed -e '/^#/! {/SSH/ s/^/# /}' -i $R/etc/iptables/iptables.rules 2> /dev/null | |||
|
675 | sed -e '/^#/! {/SSH/ s/^/# /}' -i $R/etc/iptables/ip6tables.rules 2> /dev/null | |||
|
676 | fi | |||
|
677 | ||||
665 | if [ "$ENABLE_UBOOT" = true ] ; then |
|
678 | if [ "$ENABLE_UBOOT" = true ] ; then | |
666 | # Fetch u-boot github |
|
679 | # Fetch u-boot github | |
667 | git -C $R/tmp clone git://git.denx.de/u-boot.git |
|
680 | git -C $R/tmp clone git://git.denx.de/u-boot.git |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant