From 119e166dbfa5d4eadc9bd5c427c07ef35e59320c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Fri, 17 May 2019 10:34:49 +0200 Subject: [PATCH] Upgraded pns.usr.f29 to pns.usr.f30. --- scripts/crt.sh | 8 ++++---- scripts/dnf.conf.fedora | 1 - sources/cvm.usr.f30/etc/lxc.conf | 1 + sources/pns.usr.f29/envvars | 4 ---- sources/{pns.usr.f29 => pns.usr.f30}/config | 0 sources/pns.usr.f30/envvars | 2 ++ .../firstboot/01_setupnetworking.sh | 0 .../firstboot/02_settimezone.sh | 0 .../firstboot/03_setupldap.sh | 0 .../{pns.usr.f29 => pns.usr.f30}/firstboot/99_cleanup.sh | 0 .../postinstall/01_setownership.sh | 0 .../postinstall/02_setpermissions.sh | 0 .../postinstall/03_installfiles.sh | 0 .../postinstall/10_setupservices.sh | 0 .../postinstall/99_cleanup.sh | 0 .../postinstall/install/etc/hosts | 0 .../postinstall/install/etc/named.conf | 0 .../postinstall/install/etc/sysctl.d/01-ipv6.conf | 0 .../install/var/named/173.168.192.in-addr.arpa.zone | 0 .../install/var/named/228.10.in-addr.arpa.zone | 0 .../install/var/named/42.168.192.in-addr.arpa.zone | 0 .../install/var/named/43.168.192.in-addr.arpa.zone | 0 .../postinstall/install/var/named/in.user.hu.zone | 0 .../postinstall/install/var/named/pm.user.hu.zone | 0 .../postinstall/install/var/named/sr.user.hu.zone | 0 .../postinstall/install/var/named/useribm.hu.zone | 0 .../postinstall/install/var/named/userrendszerhaz.hu.zone | 0 .../postinstall/install/var/named/usr.user.hu.zone | 0 28 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 sources/cvm.usr.f30/etc/lxc.conf delete mode 100644 sources/pns.usr.f29/envvars rename sources/{pns.usr.f29 => pns.usr.f30}/config (100%) create mode 100644 sources/pns.usr.f30/envvars rename sources/{pns.usr.f29 => pns.usr.f30}/firstboot/01_setupnetworking.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/firstboot/02_settimezone.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/firstboot/03_setupldap.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/firstboot/99_cleanup.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/01_setownership.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/02_setpermissions.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/03_installfiles.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/10_setupservices.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/99_cleanup.sh (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/etc/hosts (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/etc/named.conf (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/etc/sysctl.d/01-ipv6.conf (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/173.168.192.in-addr.arpa.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/228.10.in-addr.arpa.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/42.168.192.in-addr.arpa.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/43.168.192.in-addr.arpa.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/in.user.hu.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/pm.user.hu.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/sr.user.hu.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/useribm.hu.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/userrendszerhaz.hu.zone (100%) rename sources/{pns.usr.f29 => pns.usr.f30}/postinstall/install/var/named/usr.user.hu.zone (100%) diff --git a/scripts/crt.sh b/scripts/crt.sh index e399d96..1ed0c22 100755 --- a/scripts/crt.sh +++ b/scripts/crt.sh @@ -13,14 +13,14 @@ CONTAINER_NAME=$(basename $1) CONTAINER_OS=$(echo $CONTAINER_NAME | sed 's/^.*\.\([^\.]*\)$/\1/') CONTAINER_BASENAME=$(basename $CONTAINER_NAME .$CONTAINER_OS) case "$CONTAINER_OS" in + "f30") + DNF_RELEASEVER=30 + PREV_CONTAINER_OS="f29" + ;; "f29") DNF_RELEASEVER=29 PREV_CONTAINER_OS="f28" ;; - "f28") - DNF_RELEASEVER=28 - PREV_CONTAINER_OS="f27" - ;; *) echo "Unknown operating system: $CONTAINER_OS" >&2 exit 1 diff --git a/scripts/dnf.conf.fedora b/scripts/dnf.conf.fedora index 0f8fc9c..328cc4e 100644 --- a/scripts/dnf.conf.fedora +++ b/scripts/dnf.conf.fedora @@ -7,4 +7,3 @@ gpgcheck=0 name=Fedora $releasever - $basearch - Updates baseurl=http://store.usr.user.hu/linux/fedora/updates/$releasever/Everything/$basearch/ gpgcheck=0 -excludepkgs=dbus* diff --git a/sources/cvm.usr.f30/etc/lxc.conf b/sources/cvm.usr.f30/etc/lxc.conf new file mode 100644 index 0000000..48f7ddf --- /dev/null +++ b/sources/cvm.usr.f30/etc/lxc.conf @@ -0,0 +1 @@ +lxc.lxcpath = /lxc/containers diff --git a/sources/pns.usr.f29/envvars b/sources/pns.usr.f29/envvars deleted file mode 100644 index 225fcb0..0000000 --- a/sources/pns.usr.f29/envvars +++ /dev/null @@ -1,4 +0,0 @@ -#BASE_PACKAGES="NetworkManager initscripts openssh-server openssh-clients openssh-ldap rootfiles rsyslog sudo tar vim-minimal" -#SPEC_PACKAGES="authselect bind bind-utils openldap-clients nss-pam-ldapd pam_ssh passwd" -BASE_PACKAGES="NetworkManager initscripts rootfiles rsyslog tar" -SPEC_PACKAGES="bind bind-utils" diff --git a/sources/pns.usr.f29/config b/sources/pns.usr.f30/config similarity index 100% rename from sources/pns.usr.f29/config rename to sources/pns.usr.f30/config diff --git a/sources/pns.usr.f30/envvars b/sources/pns.usr.f30/envvars new file mode 100644 index 0000000..d338122 --- /dev/null +++ b/sources/pns.usr.f30/envvars @@ -0,0 +1,2 @@ +BASE_PACKAGES="NetworkManager initscripts rootfiles rsyslog tar" +SPEC_PACKAGES="bind bind-utils" diff --git a/sources/pns.usr.f29/firstboot/01_setupnetworking.sh b/sources/pns.usr.f30/firstboot/01_setupnetworking.sh similarity index 100% rename from sources/pns.usr.f29/firstboot/01_setupnetworking.sh rename to sources/pns.usr.f30/firstboot/01_setupnetworking.sh diff --git a/sources/pns.usr.f29/firstboot/02_settimezone.sh b/sources/pns.usr.f30/firstboot/02_settimezone.sh similarity index 100% rename from sources/pns.usr.f29/firstboot/02_settimezone.sh rename to sources/pns.usr.f30/firstboot/02_settimezone.sh diff --git a/sources/pns.usr.f29/firstboot/03_setupldap.sh b/sources/pns.usr.f30/firstboot/03_setupldap.sh similarity index 100% rename from sources/pns.usr.f29/firstboot/03_setupldap.sh rename to sources/pns.usr.f30/firstboot/03_setupldap.sh diff --git a/sources/pns.usr.f29/firstboot/99_cleanup.sh b/sources/pns.usr.f30/firstboot/99_cleanup.sh similarity index 100% rename from sources/pns.usr.f29/firstboot/99_cleanup.sh rename to sources/pns.usr.f30/firstboot/99_cleanup.sh diff --git a/sources/pns.usr.f29/postinstall/01_setownership.sh b/sources/pns.usr.f30/postinstall/01_setownership.sh similarity index 100% rename from sources/pns.usr.f29/postinstall/01_setownership.sh rename to sources/pns.usr.f30/postinstall/01_setownership.sh diff --git a/sources/pns.usr.f29/postinstall/02_setpermissions.sh b/sources/pns.usr.f30/postinstall/02_setpermissions.sh similarity index 100% rename from sources/pns.usr.f29/postinstall/02_setpermissions.sh rename to sources/pns.usr.f30/postinstall/02_setpermissions.sh diff --git a/sources/pns.usr.f29/postinstall/03_installfiles.sh b/sources/pns.usr.f30/postinstall/03_installfiles.sh similarity index 100% rename from sources/pns.usr.f29/postinstall/03_installfiles.sh rename to sources/pns.usr.f30/postinstall/03_installfiles.sh diff --git a/sources/pns.usr.f29/postinstall/10_setupservices.sh b/sources/pns.usr.f30/postinstall/10_setupservices.sh similarity index 100% rename from sources/pns.usr.f29/postinstall/10_setupservices.sh rename to sources/pns.usr.f30/postinstall/10_setupservices.sh diff --git a/sources/pns.usr.f29/postinstall/99_cleanup.sh b/sources/pns.usr.f30/postinstall/99_cleanup.sh similarity index 100% rename from sources/pns.usr.f29/postinstall/99_cleanup.sh rename to sources/pns.usr.f30/postinstall/99_cleanup.sh diff --git a/sources/pns.usr.f29/postinstall/install/etc/hosts b/sources/pns.usr.f30/postinstall/install/etc/hosts similarity index 100% rename from sources/pns.usr.f29/postinstall/install/etc/hosts rename to sources/pns.usr.f30/postinstall/install/etc/hosts diff --git a/sources/pns.usr.f29/postinstall/install/etc/named.conf b/sources/pns.usr.f30/postinstall/install/etc/named.conf similarity index 100% rename from sources/pns.usr.f29/postinstall/install/etc/named.conf rename to sources/pns.usr.f30/postinstall/install/etc/named.conf diff --git a/sources/pns.usr.f29/postinstall/install/etc/sysctl.d/01-ipv6.conf b/sources/pns.usr.f30/postinstall/install/etc/sysctl.d/01-ipv6.conf similarity index 100% rename from sources/pns.usr.f29/postinstall/install/etc/sysctl.d/01-ipv6.conf rename to sources/pns.usr.f30/postinstall/install/etc/sysctl.d/01-ipv6.conf diff --git a/sources/pns.usr.f29/postinstall/install/var/named/173.168.192.in-addr.arpa.zone b/sources/pns.usr.f30/postinstall/install/var/named/173.168.192.in-addr.arpa.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/173.168.192.in-addr.arpa.zone rename to sources/pns.usr.f30/postinstall/install/var/named/173.168.192.in-addr.arpa.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone b/sources/pns.usr.f30/postinstall/install/var/named/228.10.in-addr.arpa.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone rename to sources/pns.usr.f30/postinstall/install/var/named/228.10.in-addr.arpa.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/42.168.192.in-addr.arpa.zone b/sources/pns.usr.f30/postinstall/install/var/named/42.168.192.in-addr.arpa.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/42.168.192.in-addr.arpa.zone rename to sources/pns.usr.f30/postinstall/install/var/named/42.168.192.in-addr.arpa.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/43.168.192.in-addr.arpa.zone b/sources/pns.usr.f30/postinstall/install/var/named/43.168.192.in-addr.arpa.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/43.168.192.in-addr.arpa.zone rename to sources/pns.usr.f30/postinstall/install/var/named/43.168.192.in-addr.arpa.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/in.user.hu.zone b/sources/pns.usr.f30/postinstall/install/var/named/in.user.hu.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/in.user.hu.zone rename to sources/pns.usr.f30/postinstall/install/var/named/in.user.hu.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/pm.user.hu.zone b/sources/pns.usr.f30/postinstall/install/var/named/pm.user.hu.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/pm.user.hu.zone rename to sources/pns.usr.f30/postinstall/install/var/named/pm.user.hu.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/sr.user.hu.zone b/sources/pns.usr.f30/postinstall/install/var/named/sr.user.hu.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/sr.user.hu.zone rename to sources/pns.usr.f30/postinstall/install/var/named/sr.user.hu.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/useribm.hu.zone b/sources/pns.usr.f30/postinstall/install/var/named/useribm.hu.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/useribm.hu.zone rename to sources/pns.usr.f30/postinstall/install/var/named/useribm.hu.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/userrendszerhaz.hu.zone b/sources/pns.usr.f30/postinstall/install/var/named/userrendszerhaz.hu.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/userrendszerhaz.hu.zone rename to sources/pns.usr.f30/postinstall/install/var/named/userrendszerhaz.hu.zone diff --git a/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone b/sources/pns.usr.f30/postinstall/install/var/named/usr.user.hu.zone similarity index 100% rename from sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone rename to sources/pns.usr.f30/postinstall/install/var/named/usr.user.hu.zone -- 2.54.0