From 752a0399825ca9cead5c90724326d8f4f7f84488 Mon Sep 17 00:00:00 2001 From: Marcio Donadio Date: Thu, 31 Jul 2025 13:25:39 -0700 Subject: [PATCH 1/3] Fixed wrong instruction in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f2686e..1e96831 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ You need to run this script in a host with the docker engine installed in it. In order to generate the CentOS 7 diskless images, you just need to run the [generate.sh](generate.sh) script. The resulting files will be located in the [output](output) directory. generate.sh can be run using optional parameters: -If --prod is not passed as argument, the image will be built for production environment. Otherwise, it will build for dev environment. +If --prod is passed as argument, the image will be built for production environment. Otherwise, it will build for dev environment. Optional arguments: -h, --help Show this help message and exit From 7cde63ee86879f4b355607d95630bf1356eaea54 Mon Sep 17 00:00:00 2001 From: Marcio Donadio Date: Thu, 31 Jul 2025 13:26:08 -0700 Subject: [PATCH 2/3] Changes to mount the transition area in S3DF instead of AFS --- scripts/generate-image.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/generate-image.sh b/scripts/generate-image.sh index 51b0137..9e0bb4c 100755 --- a/scripts/generate-image.sh +++ b/scripts/generate-image.sh @@ -62,14 +62,15 @@ fi cd /centos7-builder # Download centos-release, if needed -if [ ! -f "centos-release-7-9.2009.1.el7.centos.x86_64.rpm" ]; then +if [ ! -f "centos-release-7-9.2009.0.el7.centos.x86_64.rpm" ]; then # Get the centos-release RPM - yumdownloader centos-release-7-9.2009.1.el7.centos + #yumdownloader centos-release-7-9.2009.1.el7.centos + wget ftp.cs.stanford.edu/centos/centos/7/os/x86_64/Packages/centos-release-7-9.2009.0.el7.centos.x86_64.rpm fi # centos-release contains things like the yum configs, and is necessary to bootstrap the system -rpm --root=/centos7-builder/diskless-root -ivh --nodeps centos-release-7-9.2009.1.el7.centos.x86_64.rpm - +rpm --root=/centos7-builder/diskless-root -ivh --nodeps centos-release-7-9.2009.0.el7.centos.x86_64.rpm +ls /centos7-builder/diskless-root #/etc/yum.repos.d/ # Switch to Stanford mirrors now that mirror.centos.org is offline sed -i s,mirror.centos.org,mirror.stanford.edu,g /centos7-builder/diskless-root/etc/yum.repos.d/CentOS-*.repo sed -i s,^#.*baseurl=http,baseurl=http,g /centos7-builder/diskless-root/etc/yum.repos.d/CentOS-*.repo @@ -154,7 +155,8 @@ else mkdir -p afs/slac.stanford.edu fi if [ -d "afs/slac.stanford.edu" ]; then - echo "172.23.66.102:/afs/slac.stanford.edu /afs/slac.stanford.edu nfs _netdev,auto,x-systemd.automount,x-systemd.mount-timeout=5min,x-systemd.after=sys-subsystem-net-devices-enp7s0.device,retry=10,timeo=14 0 0" > etc/fstab +# echo "172.23.66.102:/afs/slac.stanford.edu /afs/slac.stanford.edu nfs _netdev,auto,x-systemd.automount,x-systemd.mount-timeout=5min,x-systemd.after=sys-subsystem-net-devices-enp7s0.device,retry=10,timeo=14 0 0" > etc/fstab + echo "s3dflclsdevnfs001:/sdf/group/ad/transition/afs/slac.stanford.edu:/afs/slac.stanford.edu nfs _netdev,auto,x-systemd.automount,x-systemd.mount-timeout=5min,x-systemd.after=sys-subsystem-net-devices-enp7s0.device,retry=10,timeo=14 0 0" > etc/fstab fi fi From 15258f6683caf4f450065810f0c13d35e23b8f02 Mon Sep 17 00:00:00 2001 From: Marcio Donadio Date: Mon, 29 Sep 2025 13:28:27 -0700 Subject: [PATCH 3/3] Fixed typo on the fstab entry --- scripts/generate-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-image.sh b/scripts/generate-image.sh index 9e0bb4c..7881fcd 100755 --- a/scripts/generate-image.sh +++ b/scripts/generate-image.sh @@ -156,7 +156,7 @@ else fi if [ -d "afs/slac.stanford.edu" ]; then # echo "172.23.66.102:/afs/slac.stanford.edu /afs/slac.stanford.edu nfs _netdev,auto,x-systemd.automount,x-systemd.mount-timeout=5min,x-systemd.after=sys-subsystem-net-devices-enp7s0.device,retry=10,timeo=14 0 0" > etc/fstab - echo "s3dflclsdevnfs001:/sdf/group/ad/transition/afs/slac.stanford.edu:/afs/slac.stanford.edu nfs _netdev,auto,x-systemd.automount,x-systemd.mount-timeout=5min,x-systemd.after=sys-subsystem-net-devices-enp7s0.device,retry=10,timeo=14 0 0" > etc/fstab + echo "s3dflclsdevnfs001:/sdf/group/ad/transition/afs/slac.stanford.edu /afs/slac.stanford.edu nfs _netdev,auto,x-systemd.automount,x-systemd.mount-timeout=5min,x-systemd.after=sys-subsystem-net-devices-enp7s0.device,retry=10,timeo=14 0 0" > etc/fstab fi fi