[pkg-fso-maint] [Fwd: Re: debian install.sh for openmoko fdisk error "got EOF thrice - exiting.."]

[Steffen Moeller]

Hello,

I have just committed a change to insall.sh to address the issues raised by
Neil on smartphones-userland.

Some good soul please have a second pair of eyeballs glazing over it as
I cannot test it earlier than Wednesday/Thursdayish.

Many thanks and regards,

Steffen



+++ b/install.sh
@@ -1186,17 +1186,25 @@ po::powerokwait:/etc/init.d/powerfail stop
 __END__


-       echo " * Disabling automated screen lock " # FIXME: should become optional
-       if [ ! -r "$INST_DIR"/etc/frameworkd.conf.orig ]; then
-               chroot "$INST_DIR" cp /etc/frameworkd.conf
/etc/frameworkd.conf.orig
+       if [ -r "$INST_DIR"/etc/frameworkd.conf ]; then

+               echo " * Disabling automated screen lock " # FIXME: should
become optional
+               if [ ! -r "$INST_DIR"/etc/frameworkd.conf.orig ]; then

+                       chroot "$INST_DIR" cp /etc/frameworkd.conf
/etc/frameworkd.conf.orig
+               fi

+               cat "$INST_DIR"/etc/frameworkd.conf.orig | sed -e
's/^idle_prelock.*/idle_prelock = 0/' -e 's/^lock.*/lock = 0/' >
"$INST_DIR"/etc/frameworkd.conf
+       else

+               echo "W: Missing file /etc/frameworkd.conf to disable automated
screen lock"
        fi

-       cat "$INST_DIR"/etc/frameworkd.conf.orig | sed -e
's/^idle_prelock.*/idle_prelock = 0/' -e 's/^lock.*/lock = 0/' >
"$INST_DIR"/etc/frameworkd.conf

-       echo " * Allow screen unlock to work without shutting off (AUX pressed,
followed by Power shortly pressed)"
-       if [ ! -r "$INST_DIR"/etc/freesmartphone/oevents/rules.yaml.orig ]; then
-               chroot "$INST_DIR" cp /etc/freesmartphone/oevents/rules.yaml
/etc/freesmartphone/oevents/rules.yaml.orig
+       if [ -r "$INST_DIR"/etc/freesmartphone/oevents/rules.yaml ]; then
+               echo " * Allow screen unlock to work without shutting off (AUX
pressed, followed by Power shortly pressed)"
+               if [ ! -r
"$INST_DIR"/etc/freesmartphone/oevents/rules.yaml.orig ]; then
+                       chroot "$INST_DIR" cp
/etc/freesmartphone/oevents/rules.yaml /etc/freesmartphone/oevents/rules.yaml.orig
+               fi
+               cat "$INST_DIR"/etc/freesmartphone/oevents/rules.yaml.orig |
sed -e '/Suspend Handling/,/Suspend\(\)/ d' >
"$INST_DIR"/etc/freesmartphone/oevents/r
+       else
+               echo "W: Missing file /etc/freesmartphone/oevents/rules.yaml to
allow screen unlock to work without shutting off"
        fi
-       cat "$INST_DIR"/etc/freesmartphone/oevents/rules.yaml.orig | sed -e
'/Suspend Handling/,/Suspend\(\)/ d' >
"$INST_DIR"/etc/freesmartphone/oevents/rules.yam

        echo " * Creating /etc/modules"