grub, install2, stage2: add new PATH to install2-init support

features.in/grub/cfg.in/21live-install.cfg

@@ -2,7 +2,7 @@
 menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-connect.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-listen.cfg

@@ -2,7 +2,7 @@
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/generate.mk

@@ -111,6 +111,7 @@ bootargs: clean
 	@sed -i "s|@initrd_bootmethod@|$(STAGE1_INITRD_BOOTMETHOD)|g" $(DSTCFGS)
 	@sed -i "s|@initrd_typeargs@|$(STAGE1_INITRD_TYPEARGS)|g" $(DSTCFGS)
 	@sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
+	@sed -i "s,@install2_init@,$(INSTALL2_INIT),g" $(DSTCFGS)
 
 clean: copy
 	@if [ "$(GRUB_UI)" = gfxboot ]; then \

features.in/install2/install2/image-scripts.d/98-system

 #!/bin/sh
 
 # setup stage2 as init
-mv -f /usr/sbin/install2-init /sbin/init
+if [ -f /usr/sbin/install2-init ]; then
+	mv -f /usr/sbin/install2-init /sbin/init
+else
+	mv -f /usr/libexec/install2/install2-init /sbin/init
+fi

features.in/stage2/config.mk

@@ -3,6 +3,11 @@ use/stage2:: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,make-initrd file iproute2)
 	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
+ifeq (,$(filter-out sisyphus p11 c11%,$(BRANCH)))
+	@$(call set,INSTALL2_INIT,init=/usr/libexec/install2/install2-init)
+else
+	@$(call set,INSTALL2_INIT,init=/usr/sbin/install2-init)
+endif
 	@$(call xport,STAGE1_PACKAGES)
 	@$(call xport,STAGE1_KCONFIG)
 

features.in/syslinux/cfg.in/21live-install.cfg

@@ -3,5 +3,5 @@ default linux
 label linux
   menu label ^Install @relname@
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ showopts vga=@bootvga@ @bootargs@ lowmem
+  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts vga=@bootvga@ @bootargs@ lowmem
 

features.in/syslinux/cfg.in/26live-install-vnc-connect.cfg

 label vncconnect
   menu label ^VNC install (edit to set server IP address)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ showopts nosplash lovmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
+  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts nosplash lovmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
 

features.in/syslinux/cfg.in/26live-install-vnc-listen.cfg

 label vncpasswd
   menu label VNC install (<Tab>, set pass^word and connect here)
   kernel /boot/vmlinuz
-  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ showopts nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
+  append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=live @install2_init@ ramdisk_size=@live_size@ showopts nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
 

features.in/syslinux/generate.mk

@@ -94,6 +94,7 @@ bootargs: clean
 	@sed -i "s|@initrd_bootmethod@|$(STAGE1_INITRD_BOOTMETHOD)|g" $(DSTCFGS)
 	@sed -i "s|@initrd_typeargs@|$(STAGE1_INITRD_TYPEARGS)|g" $(DSTCFGS)
 	@sed -i "s,@stagename@,$(STAGE1_INITRD_STAGE2_OPTION),g" $(DSTCFGS)
+	@sed -i "s,@install2_init@,$(INSTALL2_INIT),g" $(DSTCFGS)
 
 clean: copy
 	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \