~ubuntu-branches/ubuntu/hardy/casper/hardy-proposed

« back to all changes in this revision

Viewing changes to scripts/casper-bottom/20xconfig

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2007-10-02 15:12:57 UTC
  • Revision ID: james.westby@ubuntu.com-20071002151257-4dgvwx19r9d35c73
Tags: 1.107
* Fix gconf keys for suspend and hibernate (thanks, Oliver Grawert;
  LP: #144790).
* Enable suspend again since as far as I can see we no longer need to
  probe DMI while figuring out whether to enable it (see #61535).
* Add a 'textonly' boot option to disable X (LP: #65818).
* Write the please-remove-CD message to /dev/console so that it works even
  if usplash isn't running, and make sure to set /dev/console into a sane
  state so that pressing Enter doesn't just result in ^M being displayed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
       ;;
19
19
esac
20
20
 
21
 
log_begin_msg "$DESCRIPTION"
22
 
 
23
21
if [ "$TERM_TYPE" = "serial" ]; then
24
22
    # Don't bother trying to configure or start X on a serial console
25
 
    rm -f /etc/rc?.d/S??[gxk]dm
 
23
    rm -f /root/etc/rc?.d/S??[gkx]dm
26
24
    exit 0
27
25
fi
28
26
 
36
34
                locale=*)
37
35
                        locale=${x#locale=}
38
36
                        ;;
 
37
                textonly)
 
38
                        exit 0
 
39
                        ;;
39
40
        esac
40
41
done
41
42
 
 
43
log_begin_msg "$DESCRIPTION"
 
44
 
42
45
mount -n -o bind /sys /root/sys
43
46
mount -n -o bind /proc /root/proc
44
47
mount -n -o bind /dev /root/dev