Merge branch 'release-0.9.62' of https://github.com/netblue30/firejail into release-0.9.62

5 files changed, 8 insertions, 7 deletions

diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index d807f527d..ce5d1bc96 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -25,6 +25,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <errno.h>
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
@@ -148,7 +149,7 @@ static void create_char_dev(const char *path, mode_t mode, int major, int minor)
         return;
 
 errexit:
-        fprintf(stderr, "Error: cannot create %s device\n", path);
+        fprintf(stderr, "Error: cannot create %s device: %s\n", path, strerror(errno));
         exit(1);
 }
 
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp
index 43d6a3ee0..33eb0b3fd 100755
--- a/test/environment/rlimit-profile.exp
+++ b/test/environment/rlimit-profile.exp
@@ -27,7 +27,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 1.4\n";exit}
-        "Max address space         123456789012         123456789012"
+        "Max address space         1234567890         1234567890"
 }
 expect {
         timeout {puts "TESTING ERROR 1.5\n";exit}
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp
index 38cdc3eea..c0ba895fe 100755
--- a/test/environment/rlimit.exp
+++ b/test/environment/rlimit.exp
@@ -5,7 +5,7 @@ cd /home
 spawn $env(SHELL)
 match_max 100000
 
-send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=123456789012\r"
+send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
@@ -27,7 +27,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 1.4\n";exit}
-        "Max address space         123456789012         123456789012"
+        "Max address space         1234567890         1234567890"
 }
 expect {
         timeout {puts "TESTING ERROR 1.5\n";exit}
diff --git a/test/environment/rlimit.profile b/test/environment/rlimit.profile
index a569edc6d..2f1134e6c 100644
--- a/test/environment/rlimit.profile
+++ b/test/environment/rlimit.profile
@@ -2,4 +2,4 @@ rlimit-fsize 1024
 rlimit-nproc 1000
 rlimit-nofile 500
 rlimit-sigpending 200
-rlimit-as 123456789012
+rlimit-as 1234567890
diff --git a/test/fs/private-lib.exp b/test/fs/private-lib.exp
index 777424ebe..21093e119 100755
--- a/test/fs/private-lib.exp
+++ b/test/fs/private-lib.exp
@@ -30,8 +30,8 @@ after 100
 send -- "cd /lib; find .\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "modules" {puts "TESTING ERROR 6\n";exit}
-        "firmware" {puts "TESTING ERROR 7\n";exit}
+        "./modules" {puts "TESTING ERROR 6\n";exit}
+        "./firmware" {puts "TESTING ERROR 7\n";exit}
         "libc.so"
 }
 after 100