Raspi2-3_GenImage Commit - r71:b855bcffebe1 · Collaboration Tremplin des Sciences

comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig

Jan Wagner -

r71:b855bcffebe1

parent child

Context file:

r71:b855bcffebe1

Collapse all files

files/modules/rpi2.conf created 644 +5 0

@@ -0,0 +1,5
	1	# bcm2708_rng
	2	# snd_bcm2835
	3	# i2c-bcm2708
	4	# i2c-dev
	5	# rtc-ds1307

README.md +5 -2

             ##### `KERNEL_HEADERS`=true
             Install kernel headers with built kernel.
+            ##### `KERNEL_MENUCONFIG`=false
+            Start `make menuconfig` interactive menu-driven kernel configuration. The script will continue after `make menuconfig` was terminated.
             ##### `KERNEL_RMSRC`=true
             Remove all kernel sources from the generated OS image after building.
             | `21-firewall.sh` | Setup Firewall |
             | `30-security.sh` | Setup Users and Security settings |
             | `31-logging.sh` | Setup Logging |
-            | `41-uboot.sh` | Build and Setup Uboot |
+            | `41-uboot.sh` | Build and Setup U-Boot |
             | `42-fbturbo.sh` | Build and Setup fbturbo Xorg driver |
             | `50-firstboot.sh` | First boot actions |
             | `firstboot` | Scripts that get executed on first boot  |
             | `iptables` | Firewall configuration files |
             | `locales` | Locales configuration |
-            | `modprobe.d` | Kernel Module Blacklist configuration |
+            | `modules` | Kernel Modules configuration |
             | `mount` | Fstab configuration |
             | `network` | Networking configuration files |
             | `sysctl.d` | Swapping and Network Hardening configuration |

bootstrap.d/10-bootstrap.sh +3 -3

             # Base debootstrap (unpack only)
             if [ "$ENABLE_MINBASE" = true ] ; then
-              http_proxy=${APT_PROXY} debootstrap --arch=armhf --variant=minbase --foreign --include=${APT_INCLUDES} $RELEASE $R http://${APT_SERVER}/debian
+              http_proxy=${APT_PROXY} debootstrap --arch=${RELEASE_ARCH} --variant=minbase --foreign --include=${APT_INCLUDES} ${RELEASE} $R http://${APT_SERVER}/debian
             else
-              http_proxy=${APT_PROXY} debootstrap --arch=armhf --foreign --include=${APT_INCLUDES} $RELEASE $R http://${APT_SERVER}/debian
+              http_proxy=${APT_PROXY} debootstrap --arch=${RELEASE_ARCH} --foreign --include=${APT_INCLUDES} ${RELEASE} $R http://${APT_SERVER}/debian
             fi
             # Copy qemu emulator binary to chroot
-            cp /usr/bin/qemu-arm-static $R/usr/bin
+            cp ${QEMU_BINARY} $R/usr/bin
             # Copy debian-archive-keyring.pgp
             mkdir -p $R/usr/share/keyrings

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

             # Load utility functions
             . ./functions.sh
-            # Use proxy inside chroot
+            # Install and setup APT proxy configuration
             if [ -z "$APT_PROXY" ] ; then
               install_readonly files/apt/10proxy $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
+            # Install APT pinning configuration for flash-kernel package
             install_readonly files/apt/flash-kernel $R/etc/apt/preferences.d/flash-kernel
             # Upgrade collabora package index and install collabora keyring
             chroot_exec apt-get -qq -y update
             chroot_exec apt-get -qq -y --force-yes install collabora-obs-archive-keyring
-            # Set up initial sources.list
+            # Install APT sources.list
             install_readonly files/apt/sources.list $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

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

             # Load utility functions
             . ./functions.sh
-            # Set up timezone
+            # Install and setup timezone
             echo ${TIMEZONE} >$R/etc/timezone
             chroot_exec dpkg-reconfigure -f noninteractive tzdata
-            # Set up default locale and keyboard configuration
+            # Install and setup default locale and keyboard configuration
             if [ "$ENABLE_MINBASE" = false ] ; then
               # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug
               # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957
               chroot_exec locale-gen
               chroot_exec update-locale LANG=${DEFLOCAL}
-              # Keyboard configuration, if requested
+              # Install and setup default keyboard configuration
               if [ "$XKB_MODEL" != "" ] ; then
                 sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" $R/etc/default/keyboard
               fi
               fi
               chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration
-              # Set up font console
+              # Install and setup font console
               case "${DEFLOCAL}" in
                 *UTF-8)
                   sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' $R/etc/default/console-setup
               esac
               chroot_exec dpkg-reconfigure -f noninteractive console-setup
             else # ENABLE_MINBASE=true
-              # Set POSIX default locales
+              # Install POSIX default locale
               install_readonly files/locales/locale $R/etc/default/locale
             fi

bootstrap.d/13-kernel.sh +35 -32

               git -C $R/usr/src clone --depth=1 https://github.com/raspberrypi/linux
               # Load default raspberry kernel configuration
-              make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2709_defconfig
+              make -C $R/usr/src/linux ARCH=${KERNEL_ARCH} CROSS_COMPILE=${CROSS_COMPILE} bcm2709_defconfig
               # Calculate optimal number of kernel building threads
-              if [ "KERNEL_THREADS" = 1 ] ; then
+              if [ "$KERNEL_THREADS" = 1 ] ; then
                 if [ -f /proc/cpuinfo ] ; then
                   KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
                 fi
               fi
+              # Start menu-driven kernel configuration (interactive)
+              if [ "$KERNEL_MENUCONFIG" = true ] ; then
+                make -C $R/usr/src/linux ARCH=${KERNEL_ARCH} CROSS_COMPILE=${CROSS_COMPILE} menuconfig
+              fi
               # Cross compile kernel and modules
-              make -C $R/usr/src/linux -j${KERNEL_THREADS} ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- zImage modules dtbs
+              make -C $R/usr/src/linux -j${KERNEL_THREADS} ARCH=${KERNEL_ARCH} CROSS_COMPILE=${CROSS_COMPILE} zImage modules dtbs
               # Install kernel modules
-              make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_MOD_PATH=../../.. modules_install
+              make -C $R/usr/src/linux ARCH=${KERNEL_ARCH} CROSS_COMPILE=${CROSS_COMPILE} INSTALL_MOD_PATH=../../.. modules_install
               # Install kernel headers
               if [ "$KERNEL_HEADERS" = true ]; then
-                make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_HDR_PATH=../.. headers_install
+                make -C $R/usr/src/linux ARCH=${KERNEL_ARCH} CROSS_COMPILE=${CROSS_COMPILE} INSTALL_HDR_PATH=../.. headers_install
               fi
               # Copy and rename compiled kernel to boot directory
               mkdir $R/boot/firmware/
-              $R/usr/src/linux/scripts/mkknlimg $R/usr/src/linux/arch/arm/boot/zImage $R/boot/firmware/kernel7.img
+              $R/usr/src/linux/scripts/mkknlimg $R/usr/src/linux/arch/${KERNEL_ARCH}/boot/zImage $R/boot/firmware/kernel7.img
               # Copy dts and dtb device definitions
               mkdir $R/boot/firmware/overlays/
-              cp $R/usr/src/linux/arch/arm/boot/dts/*.dtb $R/boot/firmware/
+              cp $R/usr/src/linux/arch/${KERNEL_ARCH}/boot/dts/*.dtb $R/boot/firmware/
-              cp $R/usr/src/linux/arch/arm/boot/dts/overlays/*.dtb* $R/boot/firmware/overlays/
+              cp $R/usr/src/linux/arch/${KERNEL_ARCH}/boot/dts/overlays/*.dtb* $R/boot/firmware/overlays/
-              cp $R/usr/src/linux/arch/arm/boot/dts/overlays/README $R/boot/firmware/overlays/
+              cp $R/usr/src/linux/arch/${KERNEL_ARCH}/boot/dts/overlays/README $R/boot/firmware/overlays/
               # Remove kernel sources
               if [ "$KERNEL_RMSRC" = true ]; then
                 rm -fr $R/usr/src/linux
               fi
-              # Install raspberry bootloader and flash-kernel
+              # Install raspberry bootloader and flash-kernel packages
               chroot_exec apt-get -qq -y --no-install-recommends install raspberrypi-bootloader-nokernel
             else # BUILD_KERNEL=false
               # Kernel installation
               cp $VMLINUZ $R/boot/firmware/kernel7.img
             fi
-            # Set up firmware boot cmdline
+            # Setup firmware boot cmdline
             if [ "$ENABLE_SPLITFS" = true ] ; then
               CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait net.ifnames=1 console=tty1 ${CMDLINE}"
             else
               CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait net.ifnames=1 console=tty1 ${CMDLINE}"
             fi
-            # Set up serial console support (if requested)
+            # Add serial console support
             if [ "$ENABLE_CONSOLE" = true ] ; then
               CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"
             fi
-            # Set up IPv6 networking support
+            # Remove IPv6 networking support
             if [ "$ENABLE_IPV6" = false ] ; then
               CMDLINE="${CMDLINE} ipv6.disable=1"
             fi
+            # Install firmware boot cmdline
             echo "${CMDLINE}" >$R/boot/firmware/cmdline.txt
-            # Set up firmware config
+            # Install firmware config
             install_readonly files/boot/config.txt $R/boot/firmware/config.txt
-            # Load snd_bcm2835 kernel module at boot time
+            # Setup minimal GPU memory allocation size: 16MB (no X)
-            if [ "$ENABLE_SOUND" = true ] ; then
-              echo "snd_bcm2835" >>$R/etc/modules
-            fi
-            # Set smallest possible GPU memory allocation size: 16MB (no X)
             if [ "$ENABLE_MINGPU" = true ] ; then
               echo "gpu_mem=16" >>$R/boot/firmware/config.txt
             fi
-            # Create symlinks
+            # Create firmware configuration and cmdline symlinks
             ln -sf firmware/config.txt $R/boot/config.txt
             ln -sf firmware/cmdline.txt $R/boot/cmdline.txt
-            # Prepare modules-load.d directory
+            # Install and setup kernel modules to load at boot
             mkdir -p $R/lib/modules-load.d/
+            install_readonly files/modules/rpi2.conf $R/lib/modules-load.d/rpi2.conf
-            # Load random module on boot
+            # Load hardware random module at boot
             if [ "$ENABLE_HWRANDOM" = true ] ; then
-              cat <<EOM >$R/lib/modules-load.d/rpi2.conf
+              sed -i "s/^# bcm2708_rng/bcm2708_rng/" $R/lib/modules-load.d/rpi2.conf
-            bcm2708_rng
-            EOM
             fi
-            # Prepare modprobe.d directory
+            # Load sound module at boot
-            mkdir -p $R/etc/modprobe.d/
+            if [ "$ENABLE_SOUND" = true ] ; then
+              sed -i "s/^# snd_bcm2835/snd_bcm2835/" $R/lib/modules-load.d/rpi2.conf
+            fi
-            # Blacklist sound modules
+            # Install kernel modules blacklist
-            install_readonly files/modprobe.d/raspi-blacklist.conf $R/etc/modprobe.d/raspi-blacklist.conf
+            mkdir -p $R/etc/modprobe.d/
+            install_readonly files/modules/raspi-blacklist.conf $R/etc/modprobe.d/raspi-blacklist.conf
-            # Create default fstab
+            # Install and setup fstab
             install_readonly files/mount/fstab $R/etc/fstab
             if [ "$ENABLE_SPLITFS" = true ] ; then
               sed -i 's/mmcblk0p2/sda1/' $R/etc/fstab
             fi
-            # Avoid swapping and increase cache sizes
+            # Install sysctl.d configuration files
             install_readonly files/sysctl.d/81-rpi-vm.conf $R/etc/sysctl.d/81-rpi-vm.conf

bootstrap.d/20-networking.sh +33 -29

             # Load utility functions
             . ./functions.sh
-            # Set up IPv4 hosts
+            # Install and setup hostname
             install_readonly files/network/hostname $R/etc/hostname
             sed -i "s/^rpi2-jessie/${HOSTNAME}/" $R/etc/hostname
+            # Install and setup hosts
             install_readonly files/network/hosts $R/etc/hosts
             sed -i "s/rpi2-jessie/${HOSTNAME}/" $R/etc/hosts
+            # Setup hostname entry with static IP
             if [ "$NET_ADDRESS" != "" ] ; then
               NET_IP=$(echo ${NET_ADDRESS} | cut -f 1 -d'/')
               sed -i "s/^127.0.1.1/${NET_IP}/" $R/etc/hosts
             fi
-            # Set up IPv6 hosts
+            # Remove IPv6 hosts
-            if [ "$ENABLE_IPV6" = true ] ; then
+            if [ "$ENABLE_IPV6" = false ] ; then
-              cat <<EOM >>$R/etc/hosts
+              sed -i -e "/::[1-9]/d" -e "/^$/d" $R/etc/hosts
-            ::1             localhost ip6-localhost ip6-loopback
-            ff02::1         ip6-allnodes
-            ff02::2         ip6-allrouters
-            EOM
             fi
-            # Place hint about network configuration
+            # Install hint about network configuration
             install_readonly files/network/interfaces $R/etc/network/interfaces
+            # Install configuration for interface eth0
+            install_readonly files/network/eth.network $R/etc/systemd/network/eth.network
             if [ "$ENABLE_DHCP" = true ] ; then
-              # Enable systemd-networkd DHCP configuration for interface eth0
+              # Enable DHCP configuration for interface eth0
-              install_readonly files/network/eth.network $R/etc/systemd/network/eth.network
+              sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" $R/etc/systemd/network/eth.network
               # Set DHCP configuration to IPv4 only
               if [ "$ENABLE_IPV6" = false ] ; then
-                sed -i "s/^DHCP=yes/DHCP=v4/" $R/etc/systemd/network/eth.network
+                sed -i "s/DHCP=.*/DHCP=v4/" $R/etc/systemd/network/eth.network
               fi
             else # ENABLE_DHCP=false
-              cat <<EOM >$R/etc/systemd/network/eth.network
+              # Set static network configuration for interface eth0
-            [Match]
+              sed -i\
-            Name=eth0
+              -e "s|DHCP=.*|DHCP=no|"\
+              -e "s|Address=\$|Address=${NET_ADDRESS}|"\
-            [Network]
+              -e "s|Gateway=\$|Gateway=${NET_GATEWAY}|"\
-            DHCP=no
+              -e "0,/DNS=\$/ s|DNS=\$|DNS=${NET_DNS_1}|"\
-            Address=${NET_ADDRESS}
+              -e "0,/DNS=\$/ s|DNS=\$|DNS=${NET_DNS_2}|"\
-            Gateway=${NET_GATEWAY}
+              -e "s|Domains=\$|Domains=${NET_DNS_DOMAINS}|"\
-            DNS=${NET_DNS_1}
+              -e "0,/NTP=\$/ s|NTP=\$|NTP=${NET_NTP_1}|"\
-            DNS=${NET_DNS_2}
+              -e "0,/NTP=\$/ s|NTP=\$|NTP=${NET_NTP_2}|"\
-            Domains=${NET_DNS_DOMAINS}
+              $R/etc/systemd/network/eth.network
-            NTP=${NET_NTP_1}
-            NTP=${NET_NTP_2}
-            EOM
             fi
+            # Remove empty settings from network configuration
+            sed -i "/.*=\$/d" $R/etc/systemd/network/eth.network
             # Enable systemd-networkd service
             chroot_exec systemctl enable systemd-networkd
+            # Install host.conf resolver configuration
+            install_readonly files/network/host.conf $R/etc/host.conf
             # Enable network stack hardening
             if [ "$ENABLE_HARDNET" = true ] ; then
+              # Install sysctl.d configuration files
               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
+              # Setup resolver warnings about spoofed addresses
-              install_readonly files/network/host.conf $R/etc/host.conf
+              sed -i "s/^# spoof warn/spoof warn/" $R/etc/host.conf
             fi

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

               # Create iptables configuration directory
               mkdir -p "$R/etc/iptables"
-              # Create iptables systemd service
+              # Install iptables systemd service
               install_readonly files/iptables/iptables.service $R/etc/systemd/system/iptables.service
-              # Create flush-table script called by iptables service
+              # Install flush-table script called by iptables service
               install_exec files/iptables/flush-iptables.sh $R/etc/iptables/flush-iptables.sh
-              # Create iptables rule file
+              # Install iptables rule file
               install_readonly files/iptables/iptables.rules $R/etc/iptables/iptables.rules
               # Reload systemd configuration and enable iptables service
               chroot_exec systemctl enable iptables.service
               if [ "$ENABLE_IPV6" = true ] ; then
-                # Create ip6tables systemd service
+                # Install ip6tables systemd service
                 install_readonly files/iptables/ip6tables.service $R/etc/systemd/system/ip6tables.service
-                # Create ip6tables file
+                # Install ip6tables file
                 install_exec files/iptables/flush-ip6tables.sh $R/etc/iptables/flush-ip6tables.sh
                 install_readonly files/iptables/ip6tables.rules $R/etc/iptables/ip6tables.rules

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

             # Generate crypt(3) password string
             ENCRYPTED_PASSWORD=`mkpasswd -m sha-512 ${PASSWORD}`
-            # Set up default user
+            # Setup default user
             if [ "$ENABLE_USER" = true ] ; then
               chroot_exec adduser --gecos pi --add_extra_groups --disabled-password pi
               chroot_exec usermod -a -G sudo -p "${ENCRYPTED_PASSWORD}" pi
             fi
-            # Set up root password or not
+            # Setup root password or not
             if [ "$ENABLE_ROOT" = true ]; then
               chroot_exec usermod -p "${ENCRYPTED_PASSWORD}" root

bootstrap.d/41-uboot.sh +4 -4

             #
-            # Build and Setup Uboot
+            # Build and Setup U-Boot
             #
             # Load utility functions
               cp $R/tmp/u-boot/u-boot.bin $R/boot/firmware/
               printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> $R/boot/firmware/config.txt
-              # Set U-Boot command file
+              # Install and setup U-Boot command file
               install_readonly files/boot/uboot.mkimage $R/boot/firmware/uboot.mkimage
               printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat $R/boot/firmware/uboot.mkimage)" > $R/boot/firmware/uboot.mkimage
-              # Generate U-Boot image from command file
+              # Generate U-Boot bootloader image
-              chroot_exec /tmp/u-boot/tools/mkimage -A arm -O linux -T script -C none -a 0x00000000 -e 0x00000000 -n RPi2 -d /boot/firmware/uboot.mkimage /boot/firmware/boot.scr
+              chroot_exec /tmp/u-boot/tools/mkimage -A ${KERNEL_ARCH} -O linux -T script -C none -a 0x00000000 -e 0x00000000 -n RPi2 -d /boot/firmware/uboot.mkimage /boot/firmware/boot.scr
             fi

bootstrap.d/42-fbturbo.sh +1 -1

             make install
             EOF
-              # Add fbturbo driver to Xorg configuration
+              # Install fbturbo driver Xorg configuration
               install_readonly files/xorg/99-fbturbo.conf $R/usr/share/X11/xorg.conf.d/99-fbturbo.conf
               # Remove Xorg build dependencies

files/modules/raspi-blacklist.conf ~~files/modprobe.d/raspi-blacklist.conf~~ renamed 0 0

NO CONTENT: file renamed from files/modprobe.d/raspi-blacklist.conf to files/modules/raspi-blacklist.conf

files/network/eth.network +8 -1

@@ -2,4 +2,11
2	Name=eth0	2	Name=eth0
3		3
4	[Network]	4	[Network]
5	DHCP=~~yes~~	5	DHCP=no
		6	Address=
		7	Gateway=
		8	DNS=
		9	DNS=
		10	Domains=
		11	NTP=
		12	NTP=

files/network/host.conf +2 -1

@@ -1,1 +1,2
1	spoof warn	1	# spoof warn
		2	multi on

files/network/hosts +4 0

@@ -1,2 +1,6
1	127.0.0.1 localhost	1	127.0.0.1 localhost
2	127.0.1.1 rpi2-jessie	2	127.0.1.1 rpi2-jessie
		3
		4	::1 localhost ip6-localhost ip6-loopback
		5	ff02::1 ip6-allnodes
		6	ff02::2 ip6-allrouters

rpi2-gen-image.sh +14 -6

             # Debian release
             RELEASE=${RELEASE:=jessie}
+            KERNEL_ARCH=${KERNEL_ARCH:=arm}
+            RELEASE_ARCH=${RELEASE_ARCH:=armhf}
+            CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
             COLLABORA_KERNEL=${COLLABORA_KERNEL:=3.18.0-trunk-rpi2}
+            QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
             # Build settings
             BASEDIR=$(pwd)/images/${RELEASE}
             BUILD_KERNEL=${BUILD_KERNEL:=false}
             KERNEL_THREADS=${KERNEL_THREADS:=1}
             KERNEL_HEADERS=${KERNEL_HEADERS:=true}
+            KERNEL_MENUCONFIG=${KERNEL_MENUCONFIG:=false}
             KERNEL_RMSRC=${KERNEL_RMSRC:=true}
             # Image chroot path
             # Add packages required for kernel cross compilation
             if [ "$BUILD_KERNEL" = true ] ; then
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
+              if [ "$KERNEL_MENUCONFIG" = true ] ; then
+                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} ncurses-dev"
+              fi
             fi
             # Check if all required packages are installed
             # Call "cleanup" function on various signals and errors
             trap cleanup 0 1 2 3 6
-            # Set up chroot directory
+            # Setup chroot directory
             mkdir -p $R
             # Add required packages for the minbase installation
 : start=                  0, size=                 0, Id= 0
 : start=                  0, size=                 0, Id= 0
             EOM
-              # Set up temporary loop devices
+              # Setup temporary loop devices
               FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show $BASEDIR/${DATE}-debian-${RELEASE}-frmw.img)"
               ROOT_LOOP="$(losetup -o 1M -f --show $BASEDIR/${DATE}-debian-${RELEASE}-root.img)"
             else
 : start=                  0, size=                 0, Id= 0
 : start=                  0, size=                 0, Id= 0
             EOM
-              # Set up temporary loop devices
+              # Setup temporary loop devices
               FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show $BASEDIR/${DATE}-debian-${RELEASE}.img)"
               ROOT_LOOP="$(losetup -o 65M -f --show $BASEDIR/${DATE}-debian-${RELEASE}.img)"
             fi
               bmaptool create -o "$BASEDIR/${DATE}-debian-${RELEASE}-root.bmap" "$BASEDIR/${DATE}-debian-${RELEASE}-root.img"
               # Image was successfully created
-              echo "$BASEDIR/${DATE}-debian-${RELEASE}-frmw.img ($(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              echo "$BASEDIR/${DATE}-debian-${RELEASE}-frmw.img ($(expr \( ${TABLE_SECTORS} + ${FRMW_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
-              echo "$BASEDIR/${DATE}-debian-${RELEASE}-root.img ($(expr ${TABLE_SECTORS} + ${ROOT_SECTORS} \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              echo "$BASEDIR/${DATE}-debian-${RELEASE}-root.img ($(expr \( ${TABLE_SECTORS} + ${ROOT_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
             else
               # Create block map file for "bmaptool"
               bmaptool create -o "$BASEDIR/${DATE}-debian-${RELEASE}.bmap" "$BASEDIR/${DATE}-debian-${RELEASE}.img"
               # Image was successfully created
-              echo "$BASEDIR/${DATE}-debian-${RELEASE}.img ($(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS} \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              echo "$BASEDIR/${DATE}-debian-${RELEASE}.img ($(expr \( ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
             fi

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