projects
/
grml-x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
940a1b8
)
Add two more checks to bailout if a tempfile is not available
0.3.32
author
Michael Prokop
<mika@grml.org>
Sat, 27 Oct 2007 23:40:36 +0000
(
01:40
+0200)
committer
Michael Prokop
<mika@grml.org>
Sat, 27 Oct 2007 23:40:36 +0000
(
01:40
+0200)
debian/changelog
patch
|
blob
|
history
grml-x
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
caf7959
..
7cd6109
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,3
+1,9
@@
+grml-x (0.3.32) unstable; urgency=low
+
+ * Add two more checks to bailout if a tempfile isn't available.
+
+ -- Michael Prokop <mika@grml.org> Sun, 28 Oct 2007 01:40:13 +0200
+
grml-x (0.3.31) unstable; urgency=low
* Check for writeable /tmp before executing hardware detection.
grml-x (0.3.31) unstable; urgency=low
* Check for writeable /tmp before executing hardware detection.
diff --git
a/grml-x
b/grml-x
index
89c483e
..
9a5fa0c
100755
(executable)
--- a/
grml-x
+++ b/
grml-x
@@
-273,6
+273,7
@@
Just press Ctrl-C to cancel operation.
sync()
{
[ -r "$MONITORINFO" ] || monitor # get monitor settings
sync()
{
[ -r "$MONITORINFO" ] || monitor # get monitor settings
+ [ -r "$MONITORINFO" ] || bailout 1
vsyncval=$(awk '/Vert. Sync Range:/{print $4}' $MONITORINFO | sed 's/-/.0 - / ; s/$/.0/' | head -1)
hsyncval=$(awk '/Hor. Sync Range:/{print $4}' $MONITORINFO | sed 's/-/.0 - / ; s/$/.0/' | head -1)
if [ -z $vsyncval ] ; then
vsyncval=$(awk '/Vert. Sync Range:/{print $4}' $MONITORINFO | sed 's/-/.0 - / ; s/$/.0/' | head -1)
hsyncval=$(awk '/Hor. Sync Range:/{print $4}' $MONITORINFO | sed 's/-/.0 - / ; s/$/.0/' | head -1)
if [ -z $vsyncval ] ; then
@@
-590,6
+591,7
@@
EndSection"
writehwinfo
# monitor stuff
writehwinfo
# monitor stuff
+ [ -r "$HWINFO_TMP" ] || bailout 1
MONITOR=$(awk '/monitor.1:/{print $3}' $HWINFO_TMP)
[[ $MONITOR != 'ddc' ]] && NODDC=yes
MONITOR=$(awk '/monitor.1:/{print $3}' $HWINFO_TMP)
[[ $MONITOR != 'ddc' ]] && NODDC=yes
@@
-988,7
+990,7
@@
cleanup
# xinitrc {{{
if ! [ -x "$(which $WINDOWMANAGER)" ] ; then
# xinitrc {{{
if ! [ -x "$(which $WINDOWMANAGER)" ] ; then
- print "$bg[black]$fg[red]${bold_color}Fatal: windowmanager $fg[blue]$WINDOWMANAGER$fg[red] not executable, startx w
on'
work.${reset_color}">&2
+ print "$bg[black]$fg[red]${bold_color}Fatal: windowmanager $fg[blue]$WINDOWMANAGER$fg[red] not executable, startx w
ill not
work.${reset_color}">&2
bailout
fi
if [ -w "$XINITRC" ] ; then
bailout
fi
if [ -w "$XINITRC" ] ; then