From 48fc0800a3d3d725f4e0af3c1e03c408fe29ce3e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 14 May 2016 23:42:22 +0200 Subject: nomodeset --- hel/boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hel') diff --git a/hel/boot.nix b/hel/boot.nix index af0dfe2d..103fdeca 100644 --- a/hel/boot.nix +++ b/hel/boot.nix @@ -11,6 +11,6 @@ tmpOnTmpfs = true; - extraKernelParams = ["intel_pstate=no_hwp"]; + extraKernelParams = ["intel_pstate=no_hwp" "nomodeset"]; }; } -- cgit v1.2.3 From 387a1045df0f1cef12f4be780eb2fe1ad5783110 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 00:05:07 +0200 Subject: Revert "nomodeset" This reverts commit 48fc0800a3d3d725f4e0af3c1e03c408fe29ce3e. --- hel/boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hel') diff --git a/hel/boot.nix b/hel/boot.nix index 103fdeca..af0dfe2d 100644 --- a/hel/boot.nix +++ b/hel/boot.nix @@ -11,6 +11,6 @@ tmpOnTmpfs = true; - extraKernelParams = ["intel_pstate=no_hwp" "nomodeset"]; + extraKernelParams = ["intel_pstate=no_hwp"]; }; } -- cgit v1.2.3 From bba00f87fd5460e394fc20252732647e301a67ff Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:18:09 +0200 Subject: video over uucp --- hel/recv-media.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 hel/recv-media.nix (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix new file mode 100644 index 00000000..f85598f4 --- /dev/null +++ b/hel/recv-media.nix @@ -0,0 +1,22 @@ +{ stdenv, coreutils, ffmpeg-full writeScriptBin }: + +writeScriptBin "recv-media" '' + #!${stdenv.shell} + + PATH=${ffmpeg-full}/bin:${coreutils}/bin + + dir=/var/media + + file="''${dir}/.$(basename "$1")" + file2="''${dir}/.copy.$(basename "$1")" + nFile="''${dir}/$(basename "$1")" + cat > "''${file}" + if ! ffmpeg -v warning -i "''${file}" -c copy "''${file2}" 2>&1 Date: Sun, 15 May 2016 23:18:36 +0200 Subject: syntax --- hel/recv-media.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index f85598f4..beda178c 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -1,4 +1,4 @@ -{ stdenv, coreutils, ffmpeg-full writeScriptBin }: +{ stdenv, coreutils, ffmpeg-full, writeScriptBin }: writeScriptBin "recv-media" '' #!${stdenv.shell} -- cgit v1.2.3 From 81a4f8b5192c89682367723bbb0777c29654422f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:18:49 +0200 Subject: syntax --- hel/recv-media.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index beda178c..24c7a15c 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -19,4 +19,4 @@ writeScriptBin "recv-media" '' rm -f "''${file}" mv "''${file2}" "''${nFile}" fi -''; +'' -- cgit v1.2.3 From e27a28dd6b899629d11c44baff72f19340ef0cf1 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:19:56 +0200 Subject: abort on lacking arguments --- hel/recv-media.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index 24c7a15c..d8192e0f 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -3,6 +3,8 @@ writeScriptBin "recv-media" '' #!${stdenv.shell} + [[ -z "$1" ]] && exit 2 + PATH=${ffmpeg-full}/bin:${coreutils}/bin dir=/var/media -- cgit v1.2.3 From 8ce2e7787c725b02af7eff04b094a53f178d71ed Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 16 May 2016 00:34:51 +0200 Subject: simplify recv-media --- hel/recv-media.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index d8192e0f..3bdf0c73 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -10,15 +10,17 @@ writeScriptBin "recv-media" '' dir=/var/media file="''${dir}/.$(basename "$1")" - file2="''${dir}/.copy.$(basename "$1")" + #file2="''${dir}/.copy.$(basename "$1")" nFile="''${dir}/$(basename "$1")" + #cat > "''${file}" cat > "''${file}" - if ! ffmpeg -v warning -i "''${file}" -c copy "''${file2}" 2>&1 &1 Date: Mon, 16 May 2016 00:37:58 +0200 Subject: alternate syntax for recv-media --- hel/recv-media.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index 3bdf0c73..75aa7950 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -13,14 +13,11 @@ writeScriptBin "recv-media" '' #file2="''${dir}/.copy.$(basename "$1")" nFile="''${dir}/$(basename "$1")" #cat > "''${file}" - cat > "''${file}" - mv "''${file}" "''${nFile}" - # if ! ffmpeg -v warning -i "''${file}" -c copy "''${file2}" 2>&1 &1 Date: Mon, 16 May 2016 00:39:51 +0200 Subject: arguments start at 1 --- hel/recv-media.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index 75aa7950..4ce05d44 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -13,7 +13,7 @@ writeScriptBin "recv-media" '' #file2="''${dir}/.copy.$(basename "$1")" nFile="''${dir}/$(basename "$1")" #cat > "''${file}" - if ffmpeg -v warning -i "''$0" -c copy "''${file}" 2>&1 &1 Date: Mon, 16 May 2016 00:43:25 +0200 Subject: no integrity checking in recv-media --- hel/recv-media.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index 4ce05d44..e0dc261f 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -1,23 +1,13 @@ -{ stdenv, coreutils, ffmpeg-full, writeScriptBin }: +{ stdenv, coreutils, writeScriptBin }: writeScriptBin "recv-media" '' #!${stdenv.shell} [[ -z "$1" ]] && exit 2 - PATH=${ffmpeg-full}/bin:${coreutils}/bin + PATH=${coreutils}/bin dir=/var/media - - file="''${dir}/.$(basename "$1")" - #file2="''${dir}/.copy.$(basename "$1")" - nFile="''${dir}/$(basename "$1")" - #cat > "''${file}" - if ffmpeg -v warning -i "''$1" -c copy "''${file}" 2>&1 Date: Mon, 16 May 2016 16:43:18 +0200 Subject: cp instead of mv --- hel/recv-media.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hel') diff --git a/hel/recv-media.nix b/hel/recv-media.nix index e0dc261f..b61840ec 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix @@ -9,5 +9,5 @@ writeScriptBin "recv-media" '' dir=/var/media - mv "$1" "''${dir}/$(basename "$1")" + cp -l "$1" "''${dir}/$(basename "$1")" '' -- cgit v1.2.3