diff --git a/debian/changelog b/debian/changelog index 40c340c7..8abf6345 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,10 @@ debian-cd (2.2.20) UNRELEASED; urgency=low - Try to fix powerpc DVD builds via -hfs-parms MAX_XTCSIZE. - Add prep powerpc support. - Update debian-installer tasks. + * Thiemo Seufer + - Add arcboot to the mips tasks/base-sarge list, like it is done for + other bootloaders. + - Add a default bootfile named sashARCS for mips, aliased to r4k-ip22. -- Joey Hess Mon, 30 Aug 2004 15:23:19 -0400 diff --git a/tasks/base-sarge b/tasks/base-sarge index df4daea4..0e833609 100644 --- a/tasks/base-sarge +++ b/tasks/base-sarge @@ -1077,6 +1077,7 @@ telnet libtext-iconv-perl wget dvhtool +arcboot pciutils setserial iptables diff --git a/tools/boot/sarge/post-boot-mips b/tools/boot/sarge/post-boot-mips index fde8a3d2..ea6c4ab5 100755 --- a/tools/boot/sarge/post-boot-mips +++ b/tools/boot/sarge/post-boot-mips @@ -26,6 +26,9 @@ for sub in r4k-ip22 r5k-ip22; do _size=$(isoinfo -i $CDIMAGE -lR |grep -A 10 'Directory listing of /install' |grep ${sub}-boot.img |awk '{OFMT="%.0f"; print int(($5 + 2047) / 2048) * 2048}') _bootfiles="${_bootfiles} ${sub}:${_start},${_size}" done +_start=$(isoinfo -i $CDIMAGE -lR |grep -A 10 'Directory listing of /install' |grep $r4k-ip22-boot.img |awk '{print $10 * 4}') +_size=$(isoinfo -i $CDIMAGE -lR |grep -A 10 'Directory listing of /install' |grep $r4k-ip22-boot.img |awk '{OFMT="%.0f"; print int(($5 + 2047) / 2048) * 2048}') +_bootfiles="${_bootfiles} sashARCS:${_start},${_size}" echo Bootfiles: ${_bootfiles}