Browse Source

Configurable Host HTTP/HTTPS Port Binding

Update pxeboot-update script to accept parameter for
installer base URL

Add a common function to parse the port number from
inst.repo

Update pxeboot and kickstart URLs to support a configurable
HTTP port

Story: 2004642
Task: 28593
Depends-On: https://review.openstack.org/#/c/634237/

Change-Id: Ibd66e89e49794ca57b938eb43d227860eda6674a
Signed-off-by: Tao Liu <tao.liu@windriver.com>
Tao Liu 2 months ago
parent
commit
5a44b5be49
25 changed files with 70 additions and 27 deletions
  1. 5
    0
      bsp-files/kickstarts/functions.sh
  2. 3
    3
      bsp-files/kickstarts/post_common.cfg
  3. 17
    2
      bsp-files/kickstarts/post_net_common.cfg
  4. 4
    3
      bsp-files/kickstarts/post_net_controller.cfg
  5. 2
    1
      bsp-files/kickstarts/post_platform_conf_storage.cfg
  6. 2
    1
      bsp-files/kickstarts/post_platform_conf_worker.cfg
  7. 2
    1
      bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg
  8. 4
    0
      bsp-files/kickstarts/post_pxeboot_controller.cfg
  9. 4
    0
      bsp-files/kickstarts/post_usb_controller.cfg
  10. 4
    0
      bsp-files/kickstarts/post_yow_controller.cfg
  11. 1
    1
      installer/pxe-network-installer/centos/build_srpm.data
  12. 1
    1
      installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install
  13. 1
    1
      installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install
  14. 1
    1
      installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install
  15. 1
    1
      installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install
  16. 1
    1
      installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install
  17. 1
    1
      installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install
  18. 1
    1
      installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install
  19. 1
    1
      installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install
  20. 1
    1
      installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install
  21. 1
    1
      installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install
  22. 1
    1
      installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install
  23. 1
    1
      installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install
  24. 9
    2
      installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh
  25. 1
    1
      kickstart/centos/build_srpm.data

+ 5
- 0
bsp-files/kickstarts/functions.sh View File

@@ -68,5 +68,10 @@ EOF
68 68
     exit 1
69 69
 }
70 70
 
71
+function get_http_port()
72
+{
73
+    echo \$(cat /proc/cmdline |xargs -n1 echo |grep '^inst.repo=' | sed -r 's#^[^/]*://[^/]*:([0-9]*)/.*#\1#')
74
+}
75
+
71 76
 END_FUNCTIONS
72 77
 

+ 3
- 3
bsp-files/kickstarts/post_common.cfg View File

@@ -30,16 +30,16 @@ else
30 30
    systemctl disable auditd
31 31
 fi
32 32
 
33
-
33
+. /etc/platform/platform.conf
34 34
 # Configure smart package manager channels
35 35
 rm -rf /var/lib/smart
36 36
 mkdir /var/lib/smart
37 37
 /usr/bin/smart channel -y \
38 38
     --add rpmdb type=rpm-sys name="RPM Database"
39 39
 /usr/bin/smart channel -y \
40
-    --add base type=rpm-md name="Base" baseurl=http://controller/feed/rel-xxxPLATFORM_RELEASExxx
40
+    --add base type=rpm-md name="Base" baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
41 41
 /usr/bin/smart channel -y \
42
-    --add updates type=rpm-md name="Patches" baseurl=http://controller/updates/rel-xxxPLATFORM_RELEASExxx
42
+    --add updates type=rpm-md name="Patches" baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
43 43
 
44 44
 # Configure smart to use rpm --nolinktos option
45 45
 /usr/bin/smart config --set rpm-nolinktos=true

+ 17
- 2
bsp-files/kickstarts/post_net_common.cfg View File

@@ -1,11 +1,26 @@
1
-repo --name=base --baseurl=http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/
2
-repo --name=updates --baseurl=http://pxecontroller/updates/rel-xxxPLATFORM_RELEASExxx/
1
+%pre --erroronfail
2
+
3
+# Source common functions
4
+. /tmp/ks-functions.sh
5
+
6
+http_port=$(get_http_port)
7
+echo "repo --name=base --baseurl=http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/" > /tmp/repo-include
8
+echo "repo --name=updates --baseurl=http://pxecontroller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx/" > /tmp/repo-include
9
+
10
+%end
11
+
12
+# Repository arguments from %pre
13
+%include /tmp/repo-include
14
+
3 15
 
4 16
 %post --erroronfail
5 17
 
6 18
 # Source common functions
7 19
 . /tmp/ks-functions.sh
8 20
 
21
+# Persist the http port to the platform configuration
22
+echo http_port=$(get_http_port) >> /etc/platform/platform.conf
23
+
9 24
 # Obtain the boot interface from the PXE boot
10 25
 BOOTIF=`cat /proc/cmdline |xargs -n1 echo |grep BOOTIF=`
11 26
 if [ -d /sys/firmware/efi ] ; then

+ 4
- 3
bsp-files/kickstarts/post_net_controller.cfg View File

@@ -3,8 +3,9 @@
3 3
 # Source common functions
4 4
 . /tmp/ks-functions.sh
5 5
 
6
+http_port=$(get_http_port)
6 7
 # Retrieve the installation uuid from the controller we booted from
7
-INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8
+INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8 9
 if [ $? -ne 0 ]
9 10
 then
10 11
   INSTALL_UUID=unknown
@@ -17,7 +18,7 @@ fi
17 18
 
18 19
 cd /www/pages
19 20
 # Sync software repository
20
-feed_url=http://pxecontroller/feed/
21
+feed_url=http://pxecontroller:${http_port:-8080}/feed/
21 22
 anaconda_logdir=/var/log/anaconda
22 23
 mkdir -p $anaconda_logdir
23 24
 
@@ -26,7 +27,7 @@ wget --recursive --no-parent --no-host-directories --no-clobber --reject 'index.
26 27
     || report_post_failure_with_logfile $anaconda_logdir/wget-feed-mirror.log
27 28
 
28 29
 # Sync patching repository
29
-updates_url=http://pxecontroller/updates/
30
+updates_url=http://pxecontroller:${http_port:-8080}/updates/
30 31
 wget --mirror --no-parent --no-host-directories --reject 'index.html*' --reject '*.log' $updates_url/ -o $anaconda_logdir/wget-updates-mirror.log \
31 32
     || report_post_failure_with_logfile $anaconda_logdir/wget-updates-mirror.log
32 33
 echo "Done" >/dev/console

+ 2
- 1
bsp-files/kickstarts/post_platform_conf_storage.cfg View File

@@ -4,7 +4,8 @@
4 4
 . /tmp/ks-functions.sh
5 5
 
6 6
 # Retrieve the installation uuid from the controller we booted from
7
-INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
7
+http_port=$(get_http_port)
8
+INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8 9
 if [ $? -ne 0 ]
9 10
 then
10 11
   INSTALL_UUID=unknown

+ 2
- 1
bsp-files/kickstarts/post_platform_conf_worker.cfg View File

@@ -4,7 +4,8 @@
4 4
 . /tmp/ks-functions.sh
5 5
 
6 6
 # Retrieve the installation uuid from the controller we booted from
7
-INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
7
+http_port=$(get_http_port)
8
+INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8 9
 if [ $? -ne 0 ]
9 10
 then
10 11
   INSTALL_UUID=unknown

+ 2
- 1
bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg View File

@@ -4,7 +4,8 @@
4 4
 . /tmp/ks-functions.sh
5 5
 
6 6
 # Retrieve the installation uuid from the controller we booted from
7
-INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
7
+http_port=$(get_http_port)
8
+INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8 9
 if [ $? -ne 0 ]
9 10
 then
10 11
   INSTALL_UUID=unknown

+ 4
- 0
bsp-files/kickstarts/post_pxeboot_controller.cfg View File

@@ -41,6 +41,10 @@ fi
41 41
 # overwritten when config_controller is run.
42 42
 echo management_interface=$mgmt_dev >> /etc/platform/platform.conf
43 43
 
44
+# persist the default http port number to platform configuration. This
45
+# will get overwritten when config_controller is run.
46
+echo http_port=8080 >> /etc/platform/platform.conf
47
+
44 48
 # Build networking scripts
45 49
 cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
46 50
 DEVICE=lo

+ 4
- 0
bsp-files/kickstarts/post_usb_controller.cfg View File

@@ -31,6 +31,10 @@ mgmt_dev=none
31 31
 # overwritten when config_controller is run.
32 32
 echo management_interface=$mgmt_dev >> /etc/platform/platform.conf
33 33
 
34
+# persist the default http port number to platform configuration. This
35
+# will get overwritten when config_controller is run.
36
+echo http_port=8080 >> /etc/platform/platform.conf
37
+
34 38
 # Build networking scripts
35 39
 cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
36 40
 DEVICE=lo

+ 4
- 0
bsp-files/kickstarts/post_yow_controller.cfg View File

@@ -41,6 +41,10 @@ fi
41 41
 # overwritten when config_controller is run.
42 42
 echo management_interface=$mgmt_dev >> /etc/platform/platform.conf
43 43
 
44
+# persist the default http port number to platform configuration. This
45
+# will get overwritten when config_controller is run.
46
+echo http_port=8080 >> /etc/platform/platform.conf
47
+
44 48
 # Build networking scripts
45 49
 cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
46 50
 DEVICE=lo

+ 1
- 1
installer/pxe-network-installer/centos/build_srpm.data View File

@@ -7,6 +7,6 @@ COPY_LIST="pxe-network-installer/* \
7 7
            /import/mirrors/CentOS/stx-installer/vmlinuz \
8 8
 "
9 9
 
10
-TIS_PATCH_VER=27
10
+TIS_PATCH_VER=28
11 11
 BUILD_IS_BIG=4
12 12
 BUILD_IS_SLOW=4

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install View File

@@ -22,6 +22,6 @@ LABEL 1
22 22
   MENU LABEL ^1) Standard Controller
23 23
   MENU DEFAULT
24 24
   KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25
-  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
25
+  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 26
   IPAPPEND 2
27 27
 

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install View File

@@ -22,6 +22,6 @@ LABEL 1
22 22
   MENU LABEL ^1) All-in-one
23 23
   MENU DEFAULT
24 24
   KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25
-  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
25
+  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 26
   IPAPPEND 2
27 27
 

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install View File

@@ -22,6 +22,6 @@ LABEL 1
22 22
   MENU LABEL ^1) All-in-one (lowlatency)
23 23
   MENU DEFAULT
24 24
   KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25
-  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
25
+  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 26
   IPAPPEND 2
27 27
 

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install View File

@@ -22,6 +22,6 @@ LABEL 1
22 22
   MENU LABEL ^1) Storage
23 23
   MENU DEFAULT
24 24
   KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25
-  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
25
+  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 26
   IPAPPEND 2
27 27
 

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install View File

@@ -22,6 +22,6 @@ LABEL 1
22 22
   MENU LABEL ^1) Worker
23 23
   MENU DEFAULT
24 24
   KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25
-  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
25
+  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 26
   IPAPPEND 2
27 27
 

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install View File

@@ -22,6 +22,6 @@ LABEL 1
22 22
   MENU LABEL ^1) Lowlatency Worker
23 23
   MENU DEFAULT
24 24
   KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25
-  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
25
+  APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 26
   IPAPPEND 2
27 27
 

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install View File

@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4 4
 GRUB_TIMEOUT_STYLE='countdown'
5 5
 
6 6
 menuentry '1) UEFI Standard Controller' {
7
-  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
7
+  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 8
   initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9 9
 }

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install View File

@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4 4
 GRUB_TIMEOUT_STYLE='countdown'
5 5
 
6 6
 menuentry '1) UEFI All-in-one' {
7
-  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
7
+  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 8
   initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9 9
 }

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install View File

@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4 4
 GRUB_TIMEOUT_STYLE='countdown'
5 5
 
6 6
 menuentry '1) UEFI All-in-one (lowlatency)' {
7
-  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
7
+  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 8
   initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9 9
 }

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install View File

@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4 4
 GRUB_TIMEOUT_STYLE='countdown'
5 5
 
6 6
 menuentry '1) UEFI Storage' {
7
-  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
7
+  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 8
   initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9 9
 }

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install View File

@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4 4
 GRUB_TIMEOUT_STYLE='countdown'
5 5
 
6 6
 menuentry '1) UEFI Worker' {
7
-  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
7
+  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 8
   initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9 9
 }

+ 1
- 1
installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install View File

@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4 4
 GRUB_TIMEOUT_STYLE='countdown'
5 5
 
6 6
 menuentry '1) UEFI Lowlatency Worker' {
7
-  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
7
+  linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120  ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 8
   initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9 9
 }

+ 9
- 2
installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh View File

@@ -30,11 +30,13 @@ Arguments:
30 30
     -s <mode>           : Specify Security Profile mode (optional)
31 31
     -T <tboot value>    : Specify whether or not to use tboot (optional)
32 32
     -k <kernel args>    : Specify any extra kernel boot arguments (optional)
33
+    -l <base url>       : Specify installer base URL
33 34
 
34 35
 EOF
35 36
 }
36 37
 
37 38
 declare text_install="inst.text"
39
+declare base_url="http://pxecontroller:8080"
38 40
 
39 41
 function generate_config {
40 42
     input=$1
@@ -55,7 +57,7 @@ function generate_config {
55 57
         exit 1
56 58
     fi
57 59
 
58
-    sed -e "s#xxxAPPEND_OPTIONSxxx#$APPEND_OPTIONS#" $input > $output
60
+    sed -e "s#xxxAPPEND_OPTIONSxxx#$APPEND_OPTIONS#;s#xxxBASE_URLxxx#$BASE_URL#g" $input > $output
59 61
 
60 62
     if [ $? -ne 0 -o ! -f $output ]; then
61 63
         logger --stderr -t $0 "Error: Failed to generate pxeboot file $output"
@@ -66,7 +68,7 @@ function generate_config {
66 68
 parms=$@
67 69
 logger -t $0 " $parms"
68 70
 
69
-while getopts "i:o:tgc:b:r:u:s:T:k:h" opt
71
+while getopts "i:o:tgc:b:r:u:s:T:k:l:h" opt
70 72
 do
71 73
     case $opt in
72 74
         i)
@@ -107,6 +109,9 @@ do
107 109
         k)
108 110
             kernal_extra_args=$OPTARG
109 111
             ;;
112
+        l)
113
+            base_url=$OPTARG
114
+            ;;
110 115
         h)
111 116
             usage
112 117
             exit 1
@@ -158,6 +163,8 @@ if [ -n "$kernal_extra_args" ]; then
158 163
     APPEND_OPTIONS="$APPEND_OPTIONS $kernal_extra_args"
159 164
 fi
160 165
 
166
+BASE_URL=$base_url
167
+
161 168
 generate_config $input_file $output_file
162 169
 
163 170
 # for extended security profile UEFI boot only,

+ 1
- 1
kickstart/centos/build_srpm.data View File

@@ -1,3 +1,3 @@
1 1
 SRC_DIR="${GIT_BASE}/bsp-files"
2 2
 COPY_LIST="$PKG_BASE/LICENSE"
3
-TIS_PATCH_VER=2
3
+TIS_PATCH_VER=3

Loading…
Cancel
Save