Changeset 680

Timestamp:

Nov 2, 2007 12:34:17 AM (6 years ago)

Author:

jrollins

Message:

netboot: fix severely messed up location of image links (put in tftp
dir where they belong).

File:

• trunk/netboot/update-functions (modified) (6 diffs)

trunk/netboot/update-functions

@@ -23 +23 @@
     cd "$IMAGE_DIR"
     wget -q --mirror -np "http://${IPATH}/"{linux,initrd.gz,pxelinux.cfg/default,boot-screens/{boot.txt,f{1,2,3,4,5,6,7,8,9,10}.txt}}
-    ln -sTf "${IPATH}" "$LPATH"
     )
+
+    ln -sTf "../${IMAGE_DIR}/${IPATH}" "${TFTP_DIR}/${LPATH}"
 
     cat >> "$MENU" <<EOF
 title debian-installer: $ARCH $SUITE
-kernel /$IMAGE_DIR/$LPATH/linux vga=normal mirror/suite=$SUITE $KPARAMETER --
-initrd /$IMAGE_DIR/$LPATH/initrd.gz
+kernel /$LPATH/linux vga=normal mirror/suite=$SUITE $KPARAMETER --
+initrd /$LPATH/initrd.gz
 EOF
 }
@@ -50 +51 @@
     cd "$IMAGE_DIR"
     wget -q --mirror -np "http://${IPATH}/"{linux,initrd.gz,pxelinux.cfg/default,boot-screens/{boot.txt,f{1,2,3,4,5,6,7,8,9,10}.txt}}
-    ln -sTf "${IPATH}" "$LPATH"
     )
 
+    ln -sTf "../${IMAGE_DIR}/${IPATH}" "${TFTP_DIR}/${LPATH}"
+
     cat >> "$MENU" <<EOF
-title debian-installer nightly build $DATE: $ARCH $SUITE
-kernel /$IMAGE_DIR/$LPATH/linux vga=normal mirror/suite=$SUITE $KPARAMETER --
-initrd /$IMAGE_DIR/$LPATH/initrd.gz
+title debian-installer: $ARCH $SUITE (nightly build $DATE)
+kernel /$LPATH/linux vga=normal mirror/suite=$SUITE $KPARAMETER --
+initrd /$LPATH/initrd.gz
 EOF
 }
@@ -82 +84 @@
     cd "$IMAGE_DIR"
     wget -q --mirror -np "http://${IPATH}/"{linux,initrd.gz,pxelinux.cfg/default,boot-screens/{boot.txt,f{1,2,3,4,5,6,7,8,9,10}.txt}}
-    ln -sTf "${IPATH}" "$LPATH"
     )
+
+    ln -sTf "../${IMAGE_DIR}/${IPATH}" "${TFTP_DIR}/${LPATH}"
 
     cat >> "$MENU" <<EOF
 title debian-installer GTK: $ARCH $SUITE
-kernel /$IMAGE_DIR/$LPATH/linux video=vesa:ywrap,mtrr vga=788 mirror/suite=$SUITE $KPARAMETER --
-initrd /$IMAGE_DIR/$LPATH/initrd.gz
+kernel /$LPATH/linux video=vesa:ywrap,mtrr vga=788 mirror/suite=$SUITE $KPARAMETER --
+initrd /$LPATH/initrd.gz
 EOF
 }
@@ -114 +117 @@
     cd "$IMAGE_DIR"
     wget -q --mirror -np "http://${IPATH}/"{linux,initrd.gz,pxelinux.cfg/default,boot-screens/{boot.txt,f{1,2,3,4,5,6,7,8,9,10}.txt}}
-    ln -sTf "${IPATH}" "$LPATH"
     )
+
+    ln -sTf "../${IMAGE_DIR}/${IPATH}" "${TFTP_DIR}/${LPATH}"
 
     cat >> "$MENU" <<EOF
 title ubuntu-installer: $ARCH $SUITE
-kernel /$IMAGE_DIR/$LPATH/linux vga=normal $KPARAMETER --
-initrd /$IMAGE_DIR/$LPATH/initrd.gz
+kernel /$LPATH/linux vga=normal $KPARAMETER --
+initrd /$LPATH/initrd.gz
 EOF
 }
@@ -128 +132 @@
 update_rip() {
     (
-    cd "$IMAGE_DIR/RIP"
+    cd "${IMAGE_DIR}/RIP"
     ./update
     )
+
+    ln -sTf "../${IMAGE_DIR}/RIP/current" "${TFTP_DIR}/RIP"
 
     cat >> "$MENU" <<EOF
 title RIP linux
 root (nd)
-kernel /$IMAGE_DIR/RIP/current/kernel vga=normal root=/dev/ram0 rw $KPARAMETER
-initrd /$IMAGE_DIR/RIP/current/rootfs.cgz
+kernel /RIP/kernel vga=normal root=/dev/ram0 rw $KPARAMETER
+initrd /RIP/rootfs.cgz
 EOF
 }
@@ -144 +150 @@
 update_debirf() {
     local DEBIRF_DIR="$1"
-    ln -sTf "$DEBIRF_DIR" "$IMAGE_DIR/debirf"
+
+    ln -sTf "$DEBIRF_DIR" "${TFTP_DIR}/debirf"
 
     cat >> "$MENU" <<EOF
 title debirf linux
 root (nd)
-kernel /$IMAGE_DIR/debirf/kernel vga=normal root=/dev/ram0 rw $KPARAMETER
-initrd /$IMAGE_DIR/debirf/rootfs.cgz
+kernel /debirf/kernel vga=normal root=/dev/ram0 rw $KPARAMETER
+initrd /debirf/rootfs.cgz
 EOF
 }