Raspi2-3_GenImage Commit - r70:94ac6dc790aa · Collaboration Tremplin des Sciences

code cleanup and even more spliting

Jan Wagner -

r70:94ac6dc790aa

parent child

Context file:

r70:94ac6dc790aa

Collapse all files

files/network/host.conf created 644 +1 0

			@@ -0,0 +1,1
		1	spoof warn

bootstrap.d/11-apt.sh +3 -3

              # Use proxy inside chroot
              if [ -z "$APT_PROXY" ] ; then
                install_readonly files/apt/10proxy $R/etc/apt/apt.conf.d/10proxy
-               sed -i -e "s/\"\"/\"${APT_PROXY}\"/" $R/etc/apt/apt.conf.d/10proxy
+               sed -i "s/\"\"/\"${APT_PROXY}\"/" $R/etc/apt/apt.conf.d/10proxy
              fi
              # Pin package flash-kernel to repositories.collabora.co.uk
              # Set up initial sources.list
              install_readonly files/apt/sources.list $R/etc/apt/sources.list
-             sed -i -e "s/\/ftp.debian.org\//\/${APT_SERVER}\//" $R/etc/apt/sources.list
-             sed -i -e "s/ jessie/ ${RELEASE}/" $R/etc/apt/sources.list
+             sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" $R/etc/apt/sources.list
+             sed -i "s/ jessie/ ${RELEASE}/" $R/etc/apt/sources.list
              # Upgrade package index and update all installed packages and changed dependencies
              chroot_exec apt-get -qq -y update

bootstrap.d/12-locale.sh +9 -9

                else
                  # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale
                  chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections
-                 chroot_exec sed -i "/en_US.UTF-8/s/^#//" /etc/locale.gen
+                 sed -i "/en_US.UTF-8/s/^#//" $R/etc/locale.gen
                fi
-               chroot_exec sed -i "/${DEFLOCAL}/s/^#//" /etc/locale.gen
+               sed -i "/${DEFLOCAL}/s/^#//" $R/etc/locale.gen
                chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections
                chroot_exec locale-gen
                chroot_exec update-locale LANG=${DEFLOCAL}
                # Keyboard configuration, if requested
                if [ "$XKB_MODEL" != "" ] ; then
-                 chroot_exec sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" /etc/default/keyboard
+                 sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" $R/etc/default/keyboard
                fi
                if [ "$XKB_LAYOUT" != "" ] ; then
-                 chroot_exec sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" /etc/default/keyboard
+                 sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" $R/etc/default/keyboard
                fi
                if [ "$XKB_VARIANT" != "" ] ; then
-                 chroot_exec sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" /etc/default/keyboard
+                 sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" $R/etc/default/keyboard
                fi
                if [ "$XKB_OPTIONS" != "" ] ; then
-                 chroot_exec sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" /etc/default/keyboard
+                 sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" $R/etc/default/keyboard
                fi
                chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration
                # Set up font console
                case "${DEFLOCAL}" in
                  *UTF-8)
-                   chroot_exec sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' /etc/default/console-setup
+                   sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' $R/etc/default/console-setup
                    ;;
                  *)
-                   chroot_exec sed -i 's/^CHARMAP.*/CHARMAP="guess"/' /etc/default/console-setup
+                   sed -i 's/^CHARMAP.*/CHARMAP="guess"/' $R/etc/default/console-setup
                    ;;
                esac
                chroot_exec dpkg-reconfigure -f noninteractive console-setup
-             else
+             else # ENABLE_MINBASE=true
                # Set POSIX default locales
                install_readonly files/locales/locale $R/etc/default/locale
              fi

bootstrap.d/13-kernel.sh +1 -1

                # Install raspberry bootloader and flash-kernel
                chroot_exec apt-get -qq -y --no-install-recommends install raspberrypi-bootloader-nokernel
-             else
+             else # BUILD_KERNEL=false
                # Kernel installation
                chroot_exec apt-get -qq -y --no-install-recommends install linux-image-${COLLABORA_KERNEL} raspberrypi-bootloader-nokernel

bootstrap.d/20-networking.sh +4 -5

              # Set up IPv4 hosts
              install_readonly files/network/hostname $R/etc/hostname
-             sed -i -e "s/^rpi2-jessie/${HOSTNAME}/" $R/etc/hostname
+             sed -i "s/^rpi2-jessie/${HOSTNAME}/" $R/etc/hostname
              install_readonly files/network/hosts $R/etc/hosts
-             sed -i -e "s/rpi2-jessie/${HOSTNAME}/" $R/etc/hosts
+             sed -i "s/rpi2-jessie/${HOSTNAME}/" $R/etc/hosts
              if [ "$NET_ADDRESS" != "" ] ; then
                NET_IP=$(echo ${NET_ADDRESS} | cut -f 1 -d'/')
                if [ "$ENABLE_IPV6" = false ] ; then
                  sed -i "s/^DHCP=yes/DHCP=v4/" $R/etc/systemd/network/eth.network
                fi
              else # ENABLE_DHCP=false
                cat <<EOM >$R/etc/systemd/network/eth.network
              [Match]
                install_readonly files/sysctl.d/82-rpi-net-hardening.conf $R/etc/sysctl.d/82-rpi-net-hardening.conf
              # Enable resolver warnings about spoofed addresses
-               cat <<EOM >>$R/etc/host.conf
-             spoof warn
-             EOM
+               install_readonly files/network/host.conf $R/etc/host.conf
              fi

bootstrap.d/21-firewall.sh +3 -3

                fi
              fi
-             # Remove SSHD related iptables rules
              if [ "$ENABLE_SSHD" = false ] ; then
-              sed -e '/^#/! {/SSH/ s/^/# /}' -i $R/etc/iptables/iptables.rules 2> /dev/null
-              sed -e '/^#/! {/SSH/ s/^/# /}' -i $R/etc/iptables/ip6tables.rules 2> /dev/null
+              # Remove SSHD related iptables rules
+              sed -i "/^#/! {/SSH/ s/^/# /}" $R/etc/iptables/iptables.rules 2> /dev/null
+              sed -i "/^#/! {/SSH/ s/^/# /}" $R/etc/iptables/ip6tables.rules 2> /dev/null
              fi

bootstrap.d/30-security.sh +2 -1

                chroot_exec usermod -p "${ENCRYPTED_PASSWORD}" root
                if [ "$ENABLE_ROOT_SSH" = true ]; then
-                 sed -i 's|[#]*PermitRootLogin.*|PermitRootLogin yes|g' $R/etc/ssh/sshd_config
+                 sed -i "s|[#]*PermitRootLogin.*|PermitRootLogin yes|g" $R/etc/ssh/sshd_config
                fi
              else
+               # Set no root password to disable root login
                chroot_exec usermod -p \'!\' root
              fi

bootstrap.d/31-logging.sh +1 -1

              # Disable rsyslog
              if [ "$ENABLE_RSYSLOG" = false ]; then
-               sed -i 's|[#]*ForwardToSyslog=yes|ForwardToSyslog=no|g' $R/etc/systemd/journald.conf
+               sed -i "s|[#]*ForwardToSyslog=yes|ForwardToSyslog=no|g" $R/etc/systemd/journald.conf
                chroot_exec systemctl disable rsyslog
                chroot_exec apt-get purge -q -y --force-yes rsyslog
              fi

rpi2-gen-image.sh +1 0

              # Load utility functions
              . ./functions.sh
+             # Introduce settings
              set -e
              echo -n -e "\n#\n# RPi2 Bootstrap Settings\n#\n"
              set -x

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages