8:10 a.m.
This is an automated email from the git hooks/post-receive script.
pbrobinson pushed a commit to branch master
in repository fedora-kickstarts.
The following commit(s) were added to refs/heads/master by this push:
new 77877f0 IoT: cleanups for F-31
77877f0 is described below
commit 77877f0d5a99e1f41c8595d003b05dbd894b7ea7
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
AuthorDate: Tue Jul 2 14:10:00 2019 +0100
IoT: cleanups for F-31
Signed-off-by: Peter Robinson <pbrobinson(a)fedoraproject.org>
---
fedora-iot.ks | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/fedora-iot.ks b/fedora-iot.ks
index 5dfd3c4..74a6eb1 100644
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -9,7 +9,6 @@ auth --useshadow --passalgo=sha512
selinux --enforcing
rootpw --lock --iscrypted locked
-# Add most common consoles console=ttyAMA0 console=ttyS0 console=ttyS1 as kernel boot
parameter
bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
network --bootproto=dhcp --device=link --activate --onboot=on
@@ -24,7 +23,7 @@ autopart --nohome --noswap --type=plain
# Equivalent of %include fedora-repo.ks
# Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot
--url=https://kojipkgs.fedoraproject.org/compose/iot/repo/
--ref=fedora/devel/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot
--url=https://kojipkgs.fedoraproject.org/compose/iot/repo/
--ref=fedora/rawhide/${basearch}/iot
reboot
@@ -44,21 +43,21 @@ fi
# Set the origin to the "main ref", distinct from /updates/ which is where
bodhi writes.
# We want consumers of this image to track the two week releases.
-ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/
"fedora/devel/${arch}/iot"
+ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/
"fedora/rawhide/${arch}/iot"
# Make sure the ref we're supposedly sitting on (according
# to the updated origin) exists.
-ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create
"fedora-iot:fedora/devel/${arch}/iot"
+ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create
"fedora-iot:fedora/rawhide/${arch}/iot"
# Remove the old ref so that the commit eventually gets cleaned up.
-ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete
+ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete
# delete/add the remote with new options to enable gpg verification
# and to point them at the cdn url
ostree remote delete fedora-iot
-ostree remote add --set=gpg-verify=true
--set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019
--set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist fedora-iot
'https://ostree.fedoraproject.org/iot'
+ostree remote add --set=gpg-verify=true
--set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-31-primary
--set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist fedora-iot
'https://ostree.fedoraproject.org/iot'
-# We're gettin a stray console= from somewhere, work around it
+# We're getting a stray console= from somewhere, work around it
rpm-ostree kargs --delete=console=tty0
# older versions of livecd-tools do not follow "rootpw --lock" line above
@@ -68,13 +67,6 @@ passwd -l root
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
cp /etc/skel/.bash* /var/roothome
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
# Remove any persistent NIC rules generated by udev
rm -vf /etc/udev/rules.d/*persistent-net*.rules
# And ensure that we will do DHCP on eth0 on startup
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.