Skip to content

Commit 027d91c

Browse files
matyasselmecimatyasselmeci
authored
Merge pull request #3 from matyasselmeci/pr/newplatforms
CentOS Stream 8 and Rocky Linux 8
2 parents 1f979b6 + 10f6bf5 commit 027d91c

File tree

8 files changed

+63
-12
lines changed

8 files changed

+63
-12
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ NAME_VERSION := $(NAME)-$(VERSION)
66
DATADIR := /usr/share/$(NAME)
77
BINDIR := /usr/bin
88
ETCDIR := /etc
9-
TEMPLATES := centos_7 centos_8 centos_8_stream sl_7
9+
TEMPLATES := centos_7 centos_8 centos_stream_8 sl_7 rocky_8
1010

1111
SHELL:=bash
1212

‎centos_8/kickstart.ks‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
#auth --enableshadow --passalgo=sha512 --kickstart
2-
# For some reason libguest can't detect the default (xfs)
3-
# file system for CentOS 7 installs; Overridden to use
4-
# ext4 - Moate
5-
autopart --type=lvm --fstype=ext4
62
bootloader --location=mbr --timeout=1 --append="console=tty0 console=ttyS0,115200"
73
cdrom
84
clearpart --all --initlabel

centos_8_stream/kickstart.ks renamed to centos_stream_8/kickstart.ks

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
#auth --enableshadow --passalgo=sha512 --kickstart
2-
# For some reason libguest can't detect the default (xfs)
3-
# file system for CentOS 7 installs; Overridden to use
4-
# ext4 - Moate
5-
autopart --type=lvm --fstype=ext4
62
bootloader --location=mbr --timeout=1 --append="console=tty0 console=ttyS0,115200"
73
cdrom
84
clearpart --all --initlabel

centos_8_stream/vars.json renamed to centos_stream_8/vars.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"iso_checksum" : "sha256:24544c943c0f98f3096b027bb59a93b390853b2b3b538e13566515f9121be5fc",
33
"iso_url" : "http://centos.mirrors.tds.net/centos/8-stream/isos/x86_64/CentOS-Stream-8-x86_64-20201211-dvd1.iso",
4-
"kickstart" : "centos_8_stream/kickstart.ks"
4+
"kickstart" : "centos_stream_8/kickstart.ks"
55
}

‎rocky_8/kickstart.ks‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#auth --enableshadow --passalgo=sha512 --kickstart
2+
bootloader --location=mbr --timeout=1 --append="console=tty0 console=ttyS0,115200"
3+
cdrom
4+
clearpart --all --initlabel
5+
eula --agreed
6+
firewall --disabled
7+
firstboot --disabled
8+
install
9+
keyboard us
10+
lang en_US.UTF-8
11+
network --bootproto dhcp
12+
reboot
13+
# Using external repos does not work on CentOS 8 for some reason; must get everything from the ISO.
14+
#repo --name=AppStream --baseurl=http://mirror.chtc.wisc.edu/centos/8/AppStream/x86_64/kickstart/
15+
#repo --name=BaseOS --baseurl http://mirror.chtc.wisc.edu/centos/8/BaseOS/x86_64/kickstart/
16+
#repo --name=extras --baseurl=http://mirror.chtc.wisc.edu/centos/8/extras/x86_64/kickstart/
17+
#repo --name=PowerTools --baseurl=http://mirror.chtc.wisc.edu/centos/8/PowerTools/x86_64/kickstart/
18+
#repo --name=epel --baseurl=http://mirror.chtc.wisc.edu/epel/8/x86_64/
19+
#url --url http://mirror.chtc.wisc.edu/centos/8/BaseOS/x86_64/kickstart/
20+
rootpw --iscrypted $1$22074107$h/Rm55DAZ37/ZhaVMPmFP/
21+
selinux --permissive
22+
services --enabled=NetworkManager,sshd
23+
skipx
24+
text
25+
timezone --isUtc --ntpservers ntp1.cs.wisc.edu,ntp2.cs.wisc.edu,ntp3.cs.wisc.edu America/Chicago
26+
zerombr
27+
28+
%packages --instLangs=en_US.utf8 --excludedocs
29+
@core
30+
at
31+
bzip2
32+
findutils
33+
git-core
34+
gzip
35+
make
36+
policycoreutils-python-utils
37+
sed
38+
tar
39+
%end
40+
41+
42+
%post --log=/root/ks.log
43+
yum -y config-manager --enable extras
44+
yum -y config-manager --enable powertools
45+
yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
46+
yum -y distro-sync
47+
date > /etc/creation_date
48+
mkdir /mnt/user
49+
%end

‎rocky_8/vars.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"iso_checksum" : "sha256:ffe2fae67da6702d859cfb0b321561a5d616ce87a963d8a25b018c9c3d52d9a4",
3+
"iso_url" : "https://download.rockylinux.org/pub/rocky/8/isos/x86_64/Rocky-8.4-x86_64-dvd1.iso",
4+
"kickstart" : "rocky_8/kickstart.ks"
5+
}

‎rpm/vmu-packer.spec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: Scripts for using packer for making VMU images
22
Name: vmu-packer
3-
Version: 1.1.1
3+
Version: 1.2.0
44
Release: 1%{?dist}
55
License: Apache 2.0
66
Source0: %{name}-%{version}.tar.gz
@@ -31,6 +31,11 @@ echo '{"password":"ENTER PASSWORD HERE"}' > %{buildroot}/etc/%{name}/password.js
3131
%dir /var/log/%{name}
3232

3333
%changelog
34+
* Wed Jun 23 2021 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.2.0-1
35+
- Name the CentOS Stream 8 image centos_stream_8 instead of centos_8_stream
36+
- Add Rocky Linux 8.4
37+
- Use default file system type in CentOS 8 images instead of forcing ext4
38+
3439
* Tue Jan 12 2021 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.1.1-1
3540
- Build CentOS 8 Stream in vmu-rebuild-all
3641

‎vmu-rebuild-all‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -o pipefail
44
set -o nounset
55

6-
TEMPLATES=(centos_7 centos_8 sl_7 centos_8_stream)
6+
TEMPLATES=(centos_7 centos_8 sl_7 centos_stream_8 rocky_8)
77

88
DEPLOY_DIR=/staging/osg-images
99
LOG_DIR=/var/log/vmu-packer

0 commit comments

Comments
 (0)