ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

hibernate: Fix impurities.

Browse Source 
svn path=/nixpkgs/trunk/; revision=11445
This commit is contained in:
Ludovic Courtès 2008-04-01 17:31:31 +00:00
parent bd9b19c180
commit 9231ea99d9
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/hibernate/default.nix
View File

@ -9,13 +9,25 @@ in
sha256 = "1xpc2i16jczc3nhvxlkn6fb044srqrh528gnp92cwy4hxf2nzi1z";
};
patches = [ ./install.patch ./gen-manpages.patch ];
patches = [ ./install.patch ./gen-manpages.patch ./hibernate.patch ];
buildInputs = [ gawk ];
installPhase = ''
# FIXME: Storing config files under `$out/etc' is not very useful.
substituteInPlace "hibernate.sh" --replace \
'SWSUSP_D="/etc/hibernate"' "SWSUSP_D=\"$out/etc/hibernate\""
# Remove all references to `/bin' and `/sbin'.
for i in scriptlets.d/*
do
substituteInPlace "$i" --replace "/bin/" "" --replace "/sbin/" ""
done
PREFIX="$out" CONFIG_PREFIX="$out" ./install.sh
ln -s "$out/share/hibernate/scriptlets.d" "$out/etc/hibernate"
'';
meta = {

37
pkgs/os-specific/linux/hibernate/hibernate.patch Normal file
View File

@ -0,0 +1,37 @@
--- hibernate-script-1.98.1/hibernate.sh 2008-03-31 09:40:29.000000000 +0200
+++ hibernate-script-1.98.1/hibernate.sh 2008-04-01 18:24:23.000000000 +0200
@@ -224,7 +224,7 @@ FindXServer() {
xauth="`get_env_var_of_process $xpid XAUTHORITY`"
xhome="`get_env_var_of_process $xpid HOME`"
- xuser=`/bin/ls -ld /proc/$xpid/ | awk '{print $3}'`
+ xuser=`ls -ld /proc/$xpid/ | awk '{print $3}'`
[ -z $xauth ] && [ -n $xhome ] && [ -f $xhome/.Xauthority ] && xauth=$xhome/.Xauthority
[ -z $xauth ] && continue
@@ -273,14 +273,14 @@ UsingSuspendMethod() {
# chain.
SortSuspendBits() {
# explicit path required to be ash compatible.
- /bin/echo -ne "$SUSPEND_BITS" | sort -n
+ echo -ne "$SUSPEND_BITS" | sort -n
}
# SortResumeBits: Returns a list of functions registered in the correct order
# to call for resuming, prefixed by their position number.
SortResumeBits() {
# explicit path required to be ash compatible.
- /bin/echo -ne "$RESUME_BITS" | sort -rn
+ echo -ne "$RESUME_BITS" | sort -rn
}
# WrapHelpText: takes text from stdin, wraps it with an indent of 5 and width
@@ -557,7 +557,7 @@ LoadScriptlets() {
CURRENT_SOURCED_SCRIPTLET=""
for scriptlet_dir in $SCRIPTLET_PATH ; do
[ -d "$scriptlet_dir" ] || continue
- [ -z "`/bin/ls -1 $scriptlet_dir`" ] && continue
+ [ -z "`ls -1 $scriptlet_dir`" ] && continue
for scriptlet in $scriptlet_dir/* ; do
# Avoid editor backup files.
case "$scriptlet" in *~|*.bak) continue ;; esac