Raspi2-3_GenImage Commit - r318:d4f4145692d7 · Collaboration Tremplin des Sciences

191

APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"

191

APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"

192

193

# Packages required for bootstrapping

193

# Packages required for bootstrapping

194

REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"

194

REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo netselect-apt"

195

MISSING_PACKAGES=""

195

MISSING_PACKAGES=""

196

197

#autoselect best apt mirror

198

REQUIRED_PACKAGES="${REQUIRED_PACKAGES} netselect-apt"

199

200

# Packages installed for c/c++ build environment in chroot (keep empty)

197

# Packages installed for c/c++ build environment in chroot (keep empty)

201

COMPILER_PACKAGES=""

198

COMPILER_PACKAGES=""

202

199

203

set +x

204

205

#make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!

200

#make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!

206

if [ -n "$SET_ARCH" ] ; then

201

if [ -n "$SET_ARCH" ] ; then

207

echo "Setting Architecture specific settings"

202

echo "Setting Architecture specific settings"

299

exit 1

294

exit 1

300

fi

295

fi

301

296

297

#DEBUG off

298

set +x

299

302

# Check if the internal wireless interface is supported by the RPi model

300

# Check if the internal wireless interface is supported by the RPi model

303

if [ "$ENABLE_WIRELESS" = true ] ; then

301

if [ "$ENABLE_WIRELESS" = true ] ; then

304

if [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ] ; then

302

if [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ] ; then

442

exit 1

440

exit 1

443

fi

441

fi

444

442

445

set -x

446

447

# Call "cleanup" function on various signals and errors

443

# Call "cleanup" function on various signals and errors

448

trap cleanup 0 1 2 3 6

444

trap cleanup 0 1 2 3 6

449

445

524

KERNELSRC_CONFIG=false

520

KERNELSRC_CONFIG=false

525

fi

521

fi

526

522

523

set -x

524

527

# Execute bootstrap scripts

525

# Execute bootstrap scripts

528

for SCRIPT in bootstrap.d/*.sh; do

526

for SCRIPT in bootstrap.d/*.sh; do

529

head -n 3 "$SCRIPT"

527

head -n 4 "$SCRIPT"

530

. "$SCRIPT"

528

. "$SCRIPT"

531

done

529

done

532

530

	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

             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"
             # Packages required for bootstrapping
-            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
+            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo netselect-apt"
             MISSING_PACKAGES=""
-            #autoselect best apt mirror
-            REQUIRED_PACKAGES="${REQUIRED_PACKAGES} netselect-apt"
             # Packages installed for c/c++ build environment in chroot (keep empty)
             COMPILER_PACKAGES=""
-            set +x
             #make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!
             if [ -n "$SET_ARCH" ] ; then
               echo "Setting Architecture specific settings"
               exit 1
             fi
+            #DEBUG off
+            set +x
             # Check if the internal wireless interface is supported by the RPi model
             if [ "$ENABLE_WIRELESS" = true ] ; then
               if [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ] ; then
               exit 1
             fi
-            set -x
             # Call "cleanup" function on various signals and errors
             trap cleanup 0 1 2 3 6
               KERNELSRC_CONFIG=false
             fi
+            set -x
             # Execute bootstrap scripts
             for SCRIPT in bootstrap.d/*.sh; do
-              head -n 3 "$SCRIPT"
+              head -n 4 "$SCRIPT"
               . "$SCRIPT"
             done