On Mon, 2015-04-20 at 19:11 +0100, Ian Campbell wrote: > By commenting out that one line things seem to progress in a way which > looks promising (i.e. much more spew than above). I think the most > plausible solution would be: > > diff --git a/oldsys-preseed b/oldsys-preseed > index f60196f..4cd7138 100755 > --- a/oldsys-preseed > +++ b/oldsys-preseed > @@ -115,7 +115,11 @@ case "`archdetect`" in > arm*/orion5x | arm*/kirkwood) > machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//') > # /proc/device-tree may not exist on all architectures > - dt_model=$(cat /proc/device-tree/model 2>/dev/null) > + if [ -e /proc/device-tree/model ] ; then > + dt_model=$(cat /proc/device-tree/model 2>/dev/null) > + else > + dt_model="UNKNOWN" > + fi > if echo "$machine" | grep -q "^Buffalo/Revogear Kurobox Pro"; then > check_file /proc/mtd > rootfs=$(get_mtdblock "rootfs") > > I'll build an image and test that shortly. Test was successful, proper patch is below. Ian. diff --git a/debian/changelog b/debian/changelog index 422a43d..ad9a6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +oldsys-preseed (3.16) UNRELEASED; urgency=medium + + * Avoid exiting prematurely on arm*/orion5x or arm*/kirkwood which do not use + device tree. (Closes: #783019) + + -- Ian Campbell <ijc@debian.org> Mon, 20 Apr 2015 19:06:00 +0100 + oldsys-preseed (3.15) unstable; urgency=medium [ Michael Walle ] diff --git a/oldsys-preseed b/oldsys-preseed index f60196f..4cd7138 100755 --- a/oldsys-preseed +++ b/oldsys-preseed @@ -115,7 +115,11 @@ case "`archdetect`" in arm*/orion5x | arm*/kirkwood) machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//') # /proc/device-tree may not exist on all architectures - dt_model=$(cat /proc/device-tree/model 2>/dev/null) + if [ -e /proc/device-tree/model ] ; then + dt_model=$(cat /proc/device-tree/model 2>/dev/null) + else + dt_model="UNKNOWN" + fi if echo "$machine" | grep -q "^Buffalo/Revogear Kurobox Pro"; then check_file /proc/mtd rootfs=$(get_mtdblock "rootfs")
Attachment:
signature.asc
Description: This is a digitally signed message part