summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--po/en_GB.po60
-rw-r--r--po/sv.po60
-rw-r--r--po/vi.po60
-rw-r--r--schroot/schroot.conf.5.in20
-rw-r--r--test/Makefile.am2
-rw-r--r--test/config.ex2/config30
-rw-r--r--test/config.ex2/file8
8 files changed, 129 insertions, 122 deletions
diff --git a/ChangeLog b/ChangeLog
index 32c774cc..b3e69c48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2006-01-30 Roger Leigh <rleigh@debian.org>
+ * Version 0.2.0.
+
+ * schroot/schroot.conf.5.in: Add example for file chroot.
+
+ * test/config.ex2/config: Removed (duplicated in
+ test/config.ex2/sarge).
+
+ * test/config.ex2/file: New file. Test data for file chroots.
+
+2006-01-30 Roger Leigh <rleigh@debian.org>
+
* schroot/schroot-options.cc: Beginning a session only works with
normal chroots. Session operations on active sessions load all
chroots, not just session chroots.
diff --git a/po/en_GB.po b/po/en_GB.po
index 4c28d4ab..3c4e0b30 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot 0.1.2\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-01-30 11:08+0000\n"
+"POT-Creation-Date: 2006-01-30 12:59+0000\n"
"PO-Revision-Date: 2006-01-28 16:57+0000\n"
"Last-Translator: Roger Leigh <rleigh@debian.org>\n"
"Language-Team: English <rleigh@debian.org>\n"
@@ -27,7 +27,7 @@ msgstr "PAM error: PAM is already initialised"
#: schroot/sbuild-auth.cc:532 schroot/sbuild-auth.cc:557
#: schroot/sbuild-auth.cc:576 schroot/sbuild-auth.cc:595
#: schroot/sbuild-auth.cc:614 schroot/sbuild-auth.cc:633
-#: schroot/sbuild-session.cc:599
+#: schroot/sbuild-session.cc:605
#, c-format
msgid "PAM error: %1%"
msgstr "PAM error: %1%"
@@ -449,118 +449,118 @@ msgstr "No chroot found matching alias ‘%1%’"
msgid "%1%: Failed to find chroot"
msgstr "%1%: Failed to find chroot"
-#: schroot/sbuild-session.cc:447
+#: schroot/sbuild-session.cc:453
#, c-format
msgid "Chroot setup failed to lock chroot: %1%"
msgstr "Chroot setup failed to lock chroot: %1%"
-#: schroot/sbuild-session.cc:503
+#: schroot/sbuild-session.cc:509
#, c-format
msgid "Invalid verbosity level: %1%, falling back to \"normal\""
msgstr "Invalid verbosity level: %1%, falling back to “normal”"
-#: schroot/sbuild-session.cc:522 schroot/sbuild-session.cc:814
+#: schroot/sbuild-session.cc:528 schroot/sbuild-session.cc:820
#, c-format
msgid "Failed to fork child: %1%"
msgstr "Failed to fork child: %1%"
-#: schroot/sbuild-session.cc:540 schroot/sbuild-session.cc:750
+#: schroot/sbuild-session.cc:546 schroot/sbuild-session.cc:756
#, c-format
msgid "Could not exec \"%1%\": %2%"
msgstr "Could not exec “%1%”: %2%"
-#: schroot/sbuild-session.cc:558
+#: schroot/sbuild-session.cc:564
#, c-format
msgid "Chroot setup failed to unlock chroot: %1%"
msgstr "Chroot setup failed to unlock chroot: %1%"
-#: schroot/sbuild-session.cc:565
+#: schroot/sbuild-session.cc:571
#, c-format
msgid "Chroot setup failed during chroot \"%1%\" stage"
msgstr "Chroot setup failed during chroot “%1%” stage"
-#: schroot/sbuild-session.cc:607
+#: schroot/sbuild-session.cc:613
#, c-format
msgid "Could not set gid to '%1%'"
msgstr "Could not set gid to ‘%1%’"
-#: schroot/sbuild-session.cc:613
+#: schroot/sbuild-session.cc:619
msgid "Could not set supplementary group IDs"
msgstr "Could not set supplementary group IDs"
-#: schroot/sbuild-session.cc:620
+#: schroot/sbuild-session.cc:626
#, c-format
msgid "Could not chdir to '%1%': %2%"
msgstr "Could not chdir to ‘%1%’: %2%"
-#: schroot/sbuild-session.cc:627
+#: schroot/sbuild-session.cc:633
#, c-format
msgid "Could not chroot to '%1%': %2%"
msgstr "Could not chroot to ‘%1%’: %2%"
-#: schroot/sbuild-session.cc:636
+#: schroot/sbuild-session.cc:642
#, c-format
msgid "Could not set uid to '%1%'"
msgstr "Could not set uid to ‘%1%’"
-#: schroot/sbuild-session.cc:642
+#: schroot/sbuild-session.cc:648
msgid "Failed to drop root permissions."
msgstr "Failed to drop root permissions."
-#: schroot/sbuild-session.cc:650
+#: schroot/sbuild-session.cc:656
#, c-format
msgid "warning: Could not chdir to '%1%': %2%"
msgstr "warning: Could not chdir to ‘%1%’: %2%"
-#: schroot/sbuild-session.cc:703
+#: schroot/sbuild-session.cc:709
#, c-format
msgid "[%1% chroot] Running login shell: \"%2%\""
msgstr "[%1% chroot] Running login shell: “%2%”"
-#: schroot/sbuild-session.cc:704
+#: schroot/sbuild-session.cc:710
#, c-format
msgid "[%1% chroot] Running shell: \"%2%\""
msgstr "[%1% chroot] Running shell: “%2%”"
-#: schroot/sbuild-session.cc:710
+#: schroot/sbuild-session.cc:716
#, c-format
msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
msgstr "[%1% chroot] (%2%→%3%) Running login shell: “%4%”"
-#: schroot/sbuild-session.cc:711
+#: schroot/sbuild-session.cc:717
#, c-format
msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
msgstr "[%1% chroot] (%2%→%3%) Running shell: “%4%”"
-#: schroot/sbuild-session.cc:732
+#: schroot/sbuild-session.cc:738
#, c-format
msgid "[%1% chroot] Running command: \"%2%\""
msgstr "[%1% chroot] Running command: “%2%”"
-#: schroot/sbuild-session.cc:736
+#: schroot/sbuild-session.cc:742
#, c-format
msgid "[%1% chroot] (%2%->%3%) Running command: \"%4%\""
msgstr "[%1% chroot] (%2%→%3%) Running command: “%4%”"
-#: schroot/sbuild-session.cc:768
+#: schroot/sbuild-session.cc:774
#, c-format
msgid "wait for child failed: %1%"
msgstr "wait for child failed: %1%"
-#: schroot/sbuild-session.cc:786
+#: schroot/sbuild-session.cc:792
#, c-format
msgid "Child terminated by signal %1%"
msgstr "Child terminated by signal ‘%1%’"
-#: schroot/sbuild-session.cc:791
+#: schroot/sbuild-session.cc:797
msgid "Child dumped core"
msgstr "Child dumped core"
-#: schroot/sbuild-session.cc:793
+#: schroot/sbuild-session.cc:799
msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
msgstr "Child exited abnormally (reason unknown; not a signal or core dump)"
-#: schroot/sbuild-session.cc:800
+#: schroot/sbuild-session.cc:806
#, c-format
msgid "Child exited abnormally with status '%1%'"
msgstr "Child exited abnormally with status ‘%1%’"
@@ -736,19 +736,19 @@ msgid ""
msgstr ""
"Only one chroot may be specified when recovering, running or ending a session"
-#: schroot/schroot-options.cc:217
+#: schroot/schroot-options.cc:216
msgid "Only one chroot may be specified when begining a session"
msgstr "Only one chroot may be specified when begining a session"
-#: schroot/schroot-options.cc:235
+#: schroot/schroot-options.cc:234
msgid "--chroot may not be used with --list"
msgstr "--chroot may not be used with --list"
-#: schroot/schroot-options.cc:255
+#: schroot/schroot-options.cc:254
msgid "Unknown action specified"
msgstr "Unknown action specified"
-#: schroot/schroot-options.cc:267
+#: schroot/schroot-options.cc:266
msgid "Only one action may be specified"
msgstr "Only one action may be specified"
diff --git a/po/sv.po b/po/sv.po
index 6bcb8af7..5cb6e1a9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot 0.1.2\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-01-30 11:08+0000\n"
+"POT-Creation-Date: 2006-01-30 12:59+0000\n"
"PO-Revision-Date: 2006-01-07 11:01+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -28,7 +28,7 @@ msgstr ""
#: schroot/sbuild-auth.cc:532 schroot/sbuild-auth.cc:557
#: schroot/sbuild-auth.cc:576 schroot/sbuild-auth.cc:595
#: schroot/sbuild-auth.cc:614 schroot/sbuild-auth.cc:633
-#: schroot/sbuild-session.cc:599
+#: schroot/sbuild-session.cc:605
#, fuzzy, c-format
msgid "PAM error: %1%"
msgstr "PAM-fel: %s"
@@ -460,124 +460,124 @@ msgstr "Ingen chroot hittades som matchar alias \"%s\""
msgid "%1%: Failed to find chroot"
msgstr ""
-#: schroot/sbuild-session.cc:447
+#: schroot/sbuild-session.cc:453
#, c-format
msgid "Chroot setup failed to lock chroot: %1%"
msgstr ""
-#: schroot/sbuild-session.cc:503
+#: schroot/sbuild-session.cc:509
#, c-format
msgid "Invalid verbosity level: %1%, falling back to \"normal\""
msgstr ""
-#: schroot/sbuild-session.cc:522 schroot/sbuild-session.cc:814
+#: schroot/sbuild-session.cc:528 schroot/sbuild-session.cc:820
#, fuzzy, c-format
msgid "Failed to fork child: %1%"
msgstr "Misslyckades att dela barnprocess: %s"
-#: schroot/sbuild-session.cc:540 schroot/sbuild-session.cc:750
+#: schroot/sbuild-session.cc:546 schroot/sbuild-session.cc:756
#, fuzzy, c-format
msgid "Could not exec \"%1%\": %2%"
msgstr "Kunde inte starta \"%s\": %s\n"
-#: schroot/sbuild-session.cc:558
+#: schroot/sbuild-session.cc:564
#, c-format
msgid "Chroot setup failed to unlock chroot: %1%"
msgstr ""
-#: schroot/sbuild-session.cc:565
+#: schroot/sbuild-session.cc:571
#, c-format
msgid "Chroot setup failed during chroot \"%1%\" stage"
msgstr ""
-#: schroot/sbuild-session.cc:607
+#: schroot/sbuild-session.cc:613
#, fuzzy, c-format
msgid "Could not set gid to '%1%'"
msgstr "Kunde inte sätta gid till \"%lu\"\n"
-#: schroot/sbuild-session.cc:613
+#: schroot/sbuild-session.cc:619
#, fuzzy
msgid "Could not set supplementary group IDs"
msgstr "Kunde inte sätta ID för tilläggsgrupper\n"
-#: schroot/sbuild-session.cc:620
+#: schroot/sbuild-session.cc:626
#, fuzzy, c-format
msgid "Could not chdir to '%1%': %2%"
msgstr "Kunde inte byta katalog till \"%s\": %s\n"
-#: schroot/sbuild-session.cc:627
+#: schroot/sbuild-session.cc:633
#, fuzzy, c-format
msgid "Could not chroot to '%1%': %2%"
msgstr "Kunde inte chroot till \"%s\": %s\n"
-#: schroot/sbuild-session.cc:636
+#: schroot/sbuild-session.cc:642
#, fuzzy, c-format
msgid "Could not set uid to '%1%'"
msgstr "Kunde inte sätta uid till \"%lu\"\n"
-#: schroot/sbuild-session.cc:642
+#: schroot/sbuild-session.cc:648
#, fuzzy
msgid "Failed to drop root permissions."
msgstr "Misslyckades att släppa root-rättigheter.\n"
-#: schroot/sbuild-session.cc:650
+#: schroot/sbuild-session.cc:656
#, fuzzy, c-format
msgid "warning: Could not chdir to '%1%': %2%"
msgstr "varning: Kunde inte byta katalog till \"%s\": %s\n"
-#: schroot/sbuild-session.cc:703
+#: schroot/sbuild-session.cc:709
#, fuzzy, c-format
msgid "[%1% chroot] Running login shell: \"%2%\""
msgstr "[%s chroot] Kör inloggningsskal: \"%s\"\n"
-#: schroot/sbuild-session.cc:704
+#: schroot/sbuild-session.cc:710
#, fuzzy, c-format
msgid "[%1% chroot] Running shell: \"%2%\""
msgstr "[%s chroot] Kör inloggningsskal: \"%s\"\n"
-#: schroot/sbuild-session.cc:710
+#: schroot/sbuild-session.cc:716
#, fuzzy, c-format
msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
msgstr "[%s chroot] (%s->%s) Kör inloggningsskal: \"%s\"\n"
-#: schroot/sbuild-session.cc:711
+#: schroot/sbuild-session.cc:717
#, fuzzy, c-format
msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
msgstr "[%s chroot] (%s->%s) Kör inloggningsskal: \"%s\"\n"
-#: schroot/sbuild-session.cc:732
+#: schroot/sbuild-session.cc:738
#, fuzzy, c-format
msgid "[%1% chroot] Running command: \"%2%\""
msgstr "[%s chroot] Kör kommando: \"%s\"\n"
-#: schroot/sbuild-session.cc:736
+#: schroot/sbuild-session.cc:742
#, fuzzy, c-format
msgid "[%1% chroot] (%2%->%3%) Running command: \"%4%\""
msgstr "[%s chroot] (%s->%s) Kör kommando: \"%s\"\n"
# Detta är en luring
-#: schroot/sbuild-session.cc:768
+#: schroot/sbuild-session.cc:774
#, fuzzy, c-format
msgid "wait for child failed: %1%"
msgstr "väntan på barnprocess misslyckades: %s\n"
-#: schroot/sbuild-session.cc:786
+#: schroot/sbuild-session.cc:792
#, fuzzy, c-format
msgid "Child terminated by signal %1%"
msgstr "Barnprocess avslutad med signal \"%s"
-#: schroot/sbuild-session.cc:791
+#: schroot/sbuild-session.cc:797
msgid "Child dumped core"
msgstr "Barnprocess dumpade core"
# coredump? Bättre ord?
-#: schroot/sbuild-session.cc:793
+#: schroot/sbuild-session.cc:799
msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
msgstr ""
"Barnprocess avslutades onormalt (anledning är okänd; inte en signal eller "
"coredump)"
-#: schroot/sbuild-session.cc:800
+#: schroot/sbuild-session.cc:806
#, fuzzy, c-format
msgid "Child exited abnormally with status '%1%'"
msgstr "Barnprocess avslutades onormalt med status \"%d"
@@ -760,19 +760,19 @@ msgid ""
"Only one chroot may be specified when recovering, running or ending a session"
msgstr ""
-#: schroot/schroot-options.cc:217
+#: schroot/schroot-options.cc:216
msgid "Only one chroot may be specified when begining a session"
msgstr ""
-#: schroot/schroot-options.cc:235
+#: schroot/schroot-options.cc:234
msgid "--chroot may not be used with --list"
msgstr ""
-#: schroot/schroot-options.cc:255
+#: schroot/schroot-options.cc:254
msgid "Unknown action specified"
msgstr ""
-#: schroot/schroot-options.cc:267
+#: schroot/schroot-options.cc:266
msgid "Only one action may be specified"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 1e6e1726..eab83596 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot-0.1.2\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-01-30 11:08+0000\n"
+"POT-Creation-Date: 2006-01-30 12:59+0000\n"
"PO-Revision-Date: 2006-01-15 16:32+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: schroot/sbuild-auth.cc:532 schroot/sbuild-auth.cc:557
#: schroot/sbuild-auth.cc:576 schroot/sbuild-auth.cc:595
#: schroot/sbuild-auth.cc:614 schroot/sbuild-auth.cc:633
-#: schroot/sbuild-session.cc:599
+#: schroot/sbuild-session.cc:605
#, fuzzy, c-format
msgid "PAM error: %1%"
msgstr "Lỗi PAM: %s"
@@ -460,122 +460,122 @@ msgstr "Không tìm thấy chroot khớp với biệt hiệu « %s »"
msgid "%1%: Failed to find chroot"
msgstr ""
-#: schroot/sbuild-session.cc:447
+#: schroot/sbuild-session.cc:453
#, c-format
msgid "Chroot setup failed to lock chroot: %1%"
msgstr ""
-#: schroot/sbuild-session.cc:503
+#: schroot/sbuild-session.cc:509
#, c-format
msgid "Invalid verbosity level: %1%, falling back to \"normal\""
msgstr ""
-#: schroot/sbuild-session.cc:522 schroot/sbuild-session.cc:814
+#: schroot/sbuild-session.cc:528 schroot/sbuild-session.cc:820
#, fuzzy, c-format
msgid "Failed to fork child: %1%"
msgstr "Việc tạo tiến trình con bị lỗi: %s"
-#: schroot/sbuild-session.cc:540 schroot/sbuild-session.cc:750
+#: schroot/sbuild-session.cc:546 schroot/sbuild-session.cc:756
#, fuzzy, c-format
msgid "Could not exec \"%1%\": %2%"
msgstr "Không thể thực hiện « %s »: %s\n"
-#: schroot/sbuild-session.cc:558
+#: schroot/sbuild-session.cc:564
#, c-format
msgid "Chroot setup failed to unlock chroot: %1%"
msgstr ""
-#: schroot/sbuild-session.cc:565
+#: schroot/sbuild-session.cc:571
#, c-format
msgid "Chroot setup failed during chroot \"%1%\" stage"
msgstr ""
-#: schroot/sbuild-session.cc:607
+#: schroot/sbuild-session.cc:613
#, fuzzy, c-format
msgid "Could not set gid to '%1%'"
msgstr "Không thể lập GID thành « %lu »\n"
-#: schroot/sbuild-session.cc:613
+#: schroot/sbuild-session.cc:619
#, fuzzy
msgid "Could not set supplementary group IDs"
msgstr "Không thể lập các ID nhóm phụ\n"
-#: schroot/sbuild-session.cc:620
+#: schroot/sbuild-session.cc:626
#, fuzzy, c-format
msgid "Could not chdir to '%1%': %2%"
msgstr "Không thể chdir (chuyển đổi thư mục) sang « %s »: %s\n"
-#: schroot/sbuild-session.cc:627
+#: schroot/sbuild-session.cc:633
#, fuzzy, c-format
msgid "Could not chroot to '%1%': %2%"
msgstr "Không thể chroot tới « %s »: %s\n"
-#: schroot/sbuild-session.cc:636
+#: schroot/sbuild-session.cc:642
#, fuzzy, c-format
msgid "Could not set uid to '%1%'"
msgstr "Không thể lập UID thành « %lu »\n"
-#: schroot/sbuild-session.cc:642
+#: schroot/sbuild-session.cc:648
#, fuzzy
msgid "Failed to drop root permissions."
msgstr "Việc bỏ quyền chủ bị lỗi.\n"
-#: schroot/sbuild-session.cc:650
+#: schroot/sbuild-session.cc:656
#, fuzzy, c-format
msgid "warning: Could not chdir to '%1%': %2%"
msgstr "cảnh báo : không thể chdir (chuyển đổi thư mục) sang « %s »: %s\n"
-#: schroot/sbuild-session.cc:703
+#: schroot/sbuild-session.cc:709
#, fuzzy, c-format
msgid "[%1% chroot] Running login shell: \"%2%\""
msgstr "[%s chroot] Đang chạy hệ vỏ đăng nhập: « %s »\n"
-#: schroot/sbuild-session.cc:704
+#: schroot/sbuild-session.cc:710
#, fuzzy, c-format
msgid "[%1% chroot] Running shell: \"%2%\""
msgstr "[%s chroot] Đang chạy hệ vỏ đăng nhập: « %s »\n"
-#: schroot/sbuild-session.cc:710
+#: schroot/sbuild-session.cc:716
#, fuzzy, c-format
msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
msgstr "[%s chroot] (%s->%s) Đang chạy hệ vỏ đăng nhập: « %s »\n"
-#: schroot/sbuild-session.cc:711
+#: schroot/sbuild-session.cc:717
#, fuzzy, c-format
msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
msgstr "[%s chroot] (%s->%s) Đang chạy hệ vỏ đăng nhập: « %s »\n"
-#: schroot/sbuild-session.cc:732
+#: schroot/sbuild-session.cc:738
#, fuzzy, c-format
msgid "[%1% chroot] Running command: \"%2%\""
msgstr "[%s chroot] Đang chạy lệnh: « %s »\n"
-#: schroot/sbuild-session.cc:736
+#: schroot/sbuild-session.cc:742
#, fuzzy, c-format
msgid "[%1% chroot] (%2%->%3%) Running command: \"%4%\""
msgstr "[%s chroot] (%s->%s) Đang chạy lệnh: « %s »\n"
-#: schroot/sbuild-session.cc:768
+#: schroot/sbuild-session.cc:774
#, fuzzy, c-format
msgid "wait for child failed: %1%"
msgstr "việc đợi tiến trình con bị lỗi: %s\n"
-#: schroot/sbuild-session.cc:786
+#: schroot/sbuild-session.cc:792
#, fuzzy, c-format
msgid "Child terminated by signal %1%"
msgstr "Tiến trình con bị chấm dứt do tín hiệu « %s »"
-#: schroot/sbuild-session.cc:791
+#: schroot/sbuild-session.cc:797
msgid "Child dumped core"
msgstr "Tiến trình con đã đổ lõi"
-#: schroot/sbuild-session.cc:793
+#: schroot/sbuild-session.cc:799
msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
msgstr ""
"Tiến trình con đã thoát bất thường (chưa biết sao; không phải là việc đổ tín "
"hiệu hay lõi)"
-#: schroot/sbuild-session.cc:800
+#: schroot/sbuild-session.cc:806
#, fuzzy, c-format
msgid "Child exited abnormally with status '%1%'"
msgstr "Tiến trình con đã thoát bất thường với trạng thái « %d »"
@@ -761,19 +761,19 @@ msgid ""
"Only one chroot may be specified when recovering, running or ending a session"
msgstr ""
-#: schroot/schroot-options.cc:217
+#: schroot/schroot-options.cc:216
msgid "Only one chroot may be specified when begining a session"
msgstr ""
-#: schroot/schroot-options.cc:235
+#: schroot/schroot-options.cc:234
msgid "--chroot may not be used with --list"
msgstr ""
-#: schroot/schroot-options.cc:255
+#: schroot/schroot-options.cc:254
msgid "Unknown action specified"
msgstr ""
-#: schroot/schroot-options.cc:267
+#: schroot/schroot-options.cc:266
msgid "Only one action may be specified"
msgstr ""
diff --git a/schroot/schroot.conf.5.in b/schroot/schroot.conf.5.in
index 3f3ba88c..50b86d8d 100644
--- a/schroot/schroot.conf.5.in
+++ b/schroot/schroot.conf.5.in
@@ -174,7 +174,25 @@ schroot.
\f[CR]device=/dev/hda_vg/etch_chroot\fP
.br
\f[CR]mount-options=-o atime\fP
-,br
+.br
+\f[CR]run-setup-scripts=true\fP
+.br
+\f[CR]run-session-scripts=true\fP
+.br
+\f[CR]\fP
+.br
+\f[CR][sid-file]\fP
+.br
+\f[CR]type=file\fP
+.br
+\f[CR]description=Debian sid file\-based chroot\fP
+.br
+\f[CR]priority=3\fP
+.br
+\f[CR]groups=sbuild\fP
+.br
+\f[CR]file=/srv/chroots/sid.tar.gz\fP
+.br
\f[CR]run-setup-scripts=true\fP
.br
\f[CR]run-session-scripts=true\fP
diff --git a/test/Makefile.am b/test/Makefile.am
index f8dea71f..b4693f4a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -81,7 +81,7 @@ sbuild_util_LDADD = libtest.la
EXTRA_DIST = \
keyfile.ex1 \
config.ex1 \
- config.ex2/config \
+ config.ex2/file \
config.ex2/empty \
config.ex2/experimental \
config.ex2/sarge \
diff --git a/test/config.ex2/config b/test/config.ex2/config
deleted file mode 100644
index e3596c2e..00000000
--- a/test/config.ex2/config
+++ /dev/null
@@ -1,30 +0,0 @@
-# schroot chroot definitions.
-# See schroot.conf(5) for complete documentation of the file format.
-#
-# Please take note that you should not add untrusted users to
-# root-groups, because they will essentially have full root access
-# to your system. They will only have root access inside the chroot,
-# but that's enough to cause malicious damage.
-#
-# The following lines are examples. Uncomment and alter them to
-# customise schroot for your needs.
-#
-#
-#[woody]
-#description=Debian woody (oldstable)
-#location=/home/woody-chroot
-#groups=sbuild
-#aliases=oldstable
-
-[sarge]
-description=Debian sarge (stable)
-location=/srv/chroot/sarge
-priority=2
-groups=sbuild
-root-groups=root,sbuild
-#root-groups=root
-aliases=stable
-run-setup-scripts=true
-run-session-scripts=true
-run-session-scripts=true
-
diff --git a/test/config.ex2/file b/test/config.ex2/file
new file mode 100644
index 00000000..d4a55ece
--- /dev/null
+++ b/test/config.ex2/file
@@ -0,0 +1,8 @@
+[sid-file]
+type=file
+description=Debian sid snapshot
+priority=3
+groups=sbuild,root
+file=/srv/chroots/sid.tar.gz
+run-setup-scripts=true
+run-session-scripts=true
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 18:19:04 +0000