[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Jorge Manuel B. S. Vicetto]

commit:     109e5acdbf3a3657c3fbe71e0d6109334d90892f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 02:36:50 2015 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 02:49:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=109e5acd

We need to use --automode -5 as -3 uses mv -i which is interactive and gets suck asking for confirmation to overwrite config files.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 releases/weekly/scripts/cloud-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 6778713..e022a36 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -55,7 +55,7 @@ EOL
 USE="-build" emerge -uDNv --with-bdeps=y --jobs=2 @world
 USE="-build" emerge --verbose=n --depclean
 USE="-build" emerge -v --usepkg=n @preserved-rebuild
-etc-update --automode -3
+etc-update --automode -5
 
 # Clean up portage
 emerge --verbose=n --depclean

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Jorge Manuel B. S. Vicetto]

commit:     ba4a62548f2e9e3f5f4c0064144d91499e454f52
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 12:47:48 2015 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 01:00:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=ba4a6254

Silence prep script.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 releases/weekly/scripts/cloud-prep.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index e022a36..cc902d5 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -6,7 +6,7 @@ echo 'UTC' > /etc/timezone
 # Set locale
 echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
 echo 'en_US ISO-8859-1' >> /etc/locale.gen
-locale-gen
+locale-gen -q
 eselect locale set en_US.utf8
 
 # Some rootfs stuff
@@ -68,7 +68,7 @@ sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
 # clean up system
 passwd -d root
 passwd -l root
-rm -f /usr/portage/distfiles/*
+rm -R -f /usr/portage/distfiles/*
 rm -f /etc/ssh/ssh_host_*
 rm -f /root/.bash_history
 rm -f /root/.nano_history

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     3d847f917fb1f930e6f1e9d5ef4b150c19930642
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Dec 29 04:47:17 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 04:47:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=3d847f91

remove the kernel sources after install, takes up too much space

 releases/weekly/scripts/cloud-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index cc902d5..4069cc2 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -74,6 +74,6 @@ rm -f /root/.bash_history
 rm -f /root/.nano_history
 rm -f /root/.lesshst
 rm -f /root/.ssh/known_hosts
-rm -f /usr/src/linux
+rm -rf /usr/src/linux
 for i in $(find /var/log -type f); do echo > $i; done
 for i in $(find /tmp -type f); do rm -f $i; done

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     11ebf1d11ef7dbcaaddcf930768bbe565c3937da
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Dec 29 05:09:25 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 05:09:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=11ebf1d1

always overwrite the root= kernel boot parameter

 releases/weekly/scripts/cloud-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 4069cc2..e4ace89 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -21,7 +21,7 @@ mkdir /boot/grub
 echo 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"' >> /etc/default/grub
 grub2-mkconfig -o /boot/grub/grub.cfg
 sed -r -i 's/loop[0-9]+p1/vda2/g' /boot/grub/grub.cfg
-sed -i 's/UUID=[a-z,0-9,-]*/\/dev\/vda2/g' /boot/grub/grub.cfg
+sed -i 's/root=.*\ ro/root=\/dev\/vda2\ ro/' /boot/grub/grub.cfg
 
 # And the fstab
 echo '/dev/vda2 / ext4 defaults 0 0' > /etc/fstab

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     23c069b214527c010df46a997950890f3691bfe8
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Wed Dec 30 03:29:10 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 03:29:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=23c069b2

remove kernel sources once built

 releases/weekly/scripts/cloud-prep.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index e4ace89..1905f11 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -75,5 +75,6 @@ rm -f /root/.nano_history
 rm -f /root/.lesshst
 rm -f /root/.ssh/known_hosts
 rm -rf /usr/src/linux
+rm -rf /usr/src/linux*
 for i in $(find /var/log -type f); do echo > $i; done
 for i in $(find /tmp -type f); do rm -f $i; done

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     3ced9475183d997366cbeb98d82fc96e6d9b9dd4
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Sun Jan 10 21:55:27 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 21:55:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=3ced9475

clean up foreign manpages in stage4

 releases/weekly/scripts/cloud-prep.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 116e64d..9bd5eb5 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -69,3 +69,5 @@ sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
 passwd -d root
 passwd -l root
 for i in $(find /var/log -type f); do truncate -s 0 $i; done
+# remove foreign manpages
+find /usr/share/man/ -mindepth 1  -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     c822bfa3fb2de1fa7fb7a9df3b5225709a7f332d
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Wed Jan 13 02:51:12 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 02:51:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c822bfa3

updating prep to make use of fs labels

 releases/weekly/scripts/cloud-prep.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 9bd5eb5..577af84 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -20,11 +20,11 @@ echo 'vm.swappiness = 0' >> /etc/sysctl.conf
 mkdir /boot/grub
 echo 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"' >> /etc/default/grub
 grub2-mkconfig -o /boot/grub/grub.cfg
-sed -r -i 's/loop[0-9]+p1/vda2/g' /boot/grub/grub.cfg
-sed -i 's/root=.*\ ro/root=\/dev\/vda2\ ro/' /boot/grub/grub.cfg
+sed -r -i 's/loop[0-9]+p1/LABEL\=cloudimg-rootfs/g' /boot/grub/grub.cfg
+sed -i 's/root=.*\ ro/root=LABEL\=cloudimg-rootfs\ ro/' /boot/grub/grub.cfg
 
 # And the fstab
-echo '/dev/vda2 / ext4 defaults 0 0' > /etc/fstab
+echo 'LABEL=cloudimg-rootfs / ext4 defaults 0 0' > /etc/fstab
 
 # allow the console log
 sed -i 's/#s0/s0/g' /etc/inittab

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     cf5d45a5f9070910d8060100403567f367c729bf
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Jan 22 07:53:00 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 07:53:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=cf5d45a5

try to migrate to xattr pax markings for our stage4

 releases/weekly/scripts/cloud-prep.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 577af84..3d60ca9 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -71,3 +71,7 @@ passwd -l root
 for i in $(find /var/log -type f); do truncate -s 0 $i; done
 # remove foreign manpages
 find /usr/share/man/ -mindepth 1  -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;
+
+# fine if this fails, aka non-hardened
+echo 'migraging pax'
+/usr/sbin/migrate-pax -m

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     1fe49e110bb9826dfc86e516d08a68c2e2043608
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 00:40:28 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 00:40:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=1fe49e11

make cloud-prep.sh more robust

 releases/weekly/scripts/cloud-prep.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 3d60ca9..207e4ae 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -59,7 +59,9 @@ etc-update --automode -5
 
 # Clean up portage
 emerge --verbose=n --depclean
-eix-update
+if [[ -a /usr/bin/eix ]]; then
+  eix-update
+fi
 emaint all -f
 eselect news read all
 eclean-dist --destructive
@@ -73,5 +75,7 @@ for i in $(find /var/log -type f); do truncate -s 0 $i; done
 find /usr/share/man/ -mindepth 1  -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;
 
 # fine if this fails, aka non-hardened
-echo 'migraging pax'
-/usr/sbin/migrate-pax -m
+if -a [[ /usr/sbin/migrate-pax ]]; then
+  echo 'migraging pax'
+  /usr/sbin/migrate-pax -m
+fi

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     b3244cc22df4616e23881b783473b192ab88c39a
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 06:43:53 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 06:43:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=b3244cc2

fixing typo in cloud-prep.sh script

 releases/weekly/scripts/cloud-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 207e4ae..14bfd1a 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -75,7 +75,7 @@ for i in $(find /var/log -type f); do truncate -s 0 $i; done
 find /usr/share/man/ -mindepth 1  -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;
 
 # fine if this fails, aka non-hardened
-if -a [[ /usr/sbin/migrate-pax ]]; then
+if [[ -a /usr/sbin/migrate-pax ]]; then
   echo 'migraging pax'
   /usr/sbin/migrate-pax -m
 fi

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Thode]

commit:     0c58846172ddd119b7fab00e2fb7b388fcaef482
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Thu Apr 14 00:34:22 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 00:34:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=0c588461

add ipv6 nameserver to cloud-prep script

 releases/weekly/scripts/cloud-prep.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 14bfd1a..86f3641 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -49,6 +49,7 @@ chown root:root /etc/conf.d/hostname
 # set a nice default for /etc/resolv.conf
 cat > /etc/resolv.conf << EOL
 nameserver 8.8.8.8
+nameserver 2001:4860:4860::8888
 EOL
 
 # let's upgrade (security fixes and otherwise)

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Robin H. Johnson]

commit:     430eda0a519869fd59c7ac791e83e06af2a5e876
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 23:24:56 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 23:27:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=430eda0a

cloud-prep: make grub accessible on serial console, just like the kernel.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 releases/weekly/scripts/cloud-prep.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 20f3c5a..d1f98f3 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -16,9 +16,14 @@ grep -v rootfs /proc/mounts > /etc/mtab
 echo 'net.ipv4.conf.eth0.arp_notify = 1' >> /etc/sysctl.conf
 echo 'vm.swappiness = 0' >> /etc/sysctl.conf
 
-# Let's configure out grub
+# Let's configure our grub
+# Access on both regular tty and serial console
 mkdir /boot/grub
-echo 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"' >> /etc/default/grub
+cat >>/etc/default/grub <<EOF
+GRUB_TERMINAL='serial console'
+GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
+GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
+EOF
 grub2-mkconfig -o /boot/grub/grub.cfg
 sed -r -i 's/loop[0-9]+p1/LABEL\=cloudimg-rootfs/g' /boot/grub/grub.cfg
 sed -i 's/root=.*\ ro/root=LABEL\=cloudimg-rootfs\ ro/' /boot/grub/grub.cfg

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Robin H. Johnson]

commit:     9eadf3d5bcaf3cbae34e63497a8ccbae020b6c3b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 23:24:18 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 23:27:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=9eadf3d5

cloud-prep: ensure migrate-pax is executable.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 releases/weekly/scripts/cloud-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 86f3641..20f3c5a 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -76,7 +76,7 @@ for i in $(find /var/log -type f); do truncate -s 0 $i; done
 find /usr/share/man/ -mindepth 1  -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;
 
 # fine if this fails, aka non-hardened
-if [[ -a /usr/sbin/migrate-pax ]]; then
+if [[ -x /usr/sbin/migrate-pax ]]; then
   echo 'migraging pax'
   /usr/sbin/migrate-pax -m
 fi

[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/

[Matt Turner]

commit:     6194afc47d1783145bb1ce08e024117c4ad5c5e1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 23:48:52 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 23:50:34 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=6194afc4

scripts: s/grub2-mkconfig/grub-mkconfig/

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 releases/weekly/scripts/cloud-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
index 699442fb..23bb7aa2 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -24,7 +24,7 @@ GRUB_TERMINAL='serial console'
 GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
 GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
 EOF
-grub2-mkconfig -o /boot/grub/grub.cfg
+grub-mkconfig -o /boot/grub/grub.cfg
 sed -r -i 's/loop[0-9]+p1/LABEL\=cloudimg-rootfs/g' /boot/grub/grub.cfg
 sed -i 's/root=.*\ ro/root=LABEL\=cloudimg-rootfs\ ro/' /boot/grub/grub.cfg