From 9fcf41fae1413e921b63161aedfecc9d3bb41c7d Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Sep 2018 18:39:31 +0000 Subject: --- doc/forum/configuring_texlive_papersize.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/configuring_texlive_papersize.mdwn diff --git a/doc/forum/configuring_texlive_papersize.mdwn b/doc/forum/configuring_texlive_papersize.mdwn new file mode 100644 index 00000000..1890887d --- /dev/null +++ b/doc/forum/configuring_texlive_papersize.mdwn @@ -0,0 +1 @@ +I just observed that installing texlive via propellor means I have A4 paper chose as a default. Which is all very good from an ideological point of view, but it means I can't submit this grant application ;). Is it worth having a propellor property that runs paperconfig? -- cgit v1.2.3 From 124d270cae5cf1aa15cba8d6658cbfe69742226d Mon Sep 17 00:00:00 2001 From: Nicolas.Schodet Date: Mon, 17 Sep 2018 21:57:48 +0000 Subject: Added a comment --- .../comment_7_054a8fa511b28ba6a299e3dfd9ed4dd6._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Adding_support_for_a_SQL_server/comment_7_054a8fa511b28ba6a299e3dfd9ed4dd6._comment diff --git a/doc/forum/Adding_support_for_a_SQL_server/comment_7_054a8fa511b28ba6a299e3dfd9ed4dd6._comment b/doc/forum/Adding_support_for_a_SQL_server/comment_7_054a8fa511b28ba6a299e3dfd9ed4dd6._comment new file mode 100644 index 00000000..ca5cf43d --- /dev/null +++ b/doc/forum/Adding_support_for_a_SQL_server/comment_7_054a8fa511b28ba6a299e3dfd9ed4dd6._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="Nicolas.Schodet" + avatar="http://cdn.libravatar.org/avatar/0d7ec808ec329d04ee9a93c0da3c0089" + subject="comment 7" + date="2018-09-17T21:57:48Z" + content=""" +Database is a database name. + +I will make the change as soon as I have some time, thanks for the review! +"""]] -- cgit v1.2.3 From 97000fc980d22d97600710b7dad4c1f1cdb8a57d Mon Sep 17 00:00:00 2001 From: spwhitton Date: Tue, 18 Sep 2018 22:17:07 +0000 Subject: Added a comment --- ...mment_1_e4c1bd36c3739d4dd9bf7316c9021a14._comment | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/forum/configuring_texlive_papersize/comment_1_e4c1bd36c3739d4dd9bf7316c9021a14._comment diff --git a/doc/forum/configuring_texlive_papersize/comment_1_e4c1bd36c3739d4dd9bf7316c9021a14._comment b/doc/forum/configuring_texlive_papersize/comment_1_e4c1bd36c3739d4dd9bf7316c9021a14._comment new file mode 100644 index 00000000..ac85d2b3 --- /dev/null +++ b/doc/forum/configuring_texlive_papersize/comment_1_e4c1bd36c3739d4dd9bf7316c9021a14._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 1" + date="2018-09-18T22:17:07Z" + content=""" +I have this (the laptop is otherwise en_GB): + + -- iris is in the US + & \"en_US.UTF-8\" `Locale.selectedFor` + [ \"LC_PAPER\" + , \"LC_ADDRESS\" + , \"LC_MONETARY\" + , \"LC_TELEPHONE\" + , \"LC_TIME\" + ] + & \"/etc/papersize\" `File.hasContent` [\"letter\"] + `onChange` Apt.reConfigure \"libpaper1\" [] + +"""]] -- cgit v1.2.3 From 6eaf639a44db1344bfe0fa0ec4b551189fca1650 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 4 Oct 2018 02:07:50 +0000 Subject: --- doc/forum/installing_small_binary_files.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/installing_small_binary_files.mdwn diff --git a/doc/forum/installing_small_binary_files.mdwn b/doc/forum/installing_small_binary_files.mdwn new file mode 100644 index 00000000..080f49a1 --- /dev/null +++ b/doc/forum/installing_small_binary_files.mdwn @@ -0,0 +1 @@ +I need to install a small firmware file (it's actually free software, but I need it to boot the emulator I could build it with). I could of course make a debian package and put that package in a repo, but that seems like a lot of fuss for a 32k file. OTOH, I'm a bit loathe to use PrivData for this. Anyone care to either suggest a better way, or convince me it's fine to store firmware in PrivData? -- cgit v1.2.3 From 6e8d8beeaee4e3406441bd0c472e7fb710817f8c Mon Sep 17 00:00:00 2001 From: david Date: Thu, 4 Oct 2018 10:19:35 +0000 Subject: Added a comment: In this case I really should make a package --- .../comment_1_7537a56c67658ad47460a3b80690ecfd._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/installing_small_binary_files/comment_1_7537a56c67658ad47460a3b80690ecfd._comment diff --git a/doc/forum/installing_small_binary_files/comment_1_7537a56c67658ad47460a3b80690ecfd._comment b/doc/forum/installing_small_binary_files/comment_1_7537a56c67658ad47460a3b80690ecfd._comment new file mode 100644 index 00000000..95a11dae --- /dev/null +++ b/doc/forum/installing_small_binary_files/comment_1_7537a56c67658ad47460a3b80690ecfd._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="david" + avatar="http://cdn.libravatar.org/avatar/22c2d800db6a7699139df604a67cb221" + subject="In this case I really should make a package" + date="2018-10-04T10:19:35Z" + content=""" +After some reflection I realized that have propellor drop things in /usr/share/qemu is just going to make me sad in the long run. I still think the general question is potentially useful, but I guess it's a bit hypothetical at this point. +"""]] -- cgit v1.2.3 From 772bd8e3902f8c4a052d13bc786e341837a47e24 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 4 Oct 2018 13:33:14 +0000 Subject: --- .../support_for_non-bootable_disk_images.mdwn | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 doc/forum/support_for_non-bootable_disk_images.mdwn diff --git a/doc/forum/support_for_non-bootable_disk_images.mdwn b/doc/forum/support_for_non-bootable_disk_images.mdwn new file mode 100644 index 00000000..1c62c599 --- /dev/null +++ b/doc/forum/support_for_non-bootable_disk_images.mdwn @@ -0,0 +1,59 @@ +qemu-system-s390x has the apparent quirk that it can only boot via something like + + `qemu-system-s390x -kernel kernel.debian -initrd initrd.debian -m 512 -nographic --drive file=rootimage.img,format=raw,if=none,id=c1` + +This means I think what I want to do is something like the following + +[[!format haskell """ + & imageBuilt (RawDiskImage "/srv/vm/bricklin.img") bricklinChroot + MSDOS + [ partition EXT4 `mountedAt` "/" + `addFreeSpace` MegaBytes 100 + `mountOpt` errorReadonly + , swapPartition (MegaBytes 256) + ] + where + bricklinChroot d = debootstrapped mempty d $ props + & osDebian (Stable "stretch") S390X + & Apt.installed [ "linux-image-s390x" ] +"""]] + +This seems to build the image OK (see end of post), but propellor fails because the image is not bootable (the image contents might need adjustment as well, but first things first). +I'm not sure what this style of booting is called, but I see people providing "cloud images" meant to be used this way, with separate initrd and and kernel. Is it sensible to customize imageBuilt for this purpose, or would it be better write my own `nonBootableImageBuilt` or something like that? + + +[[!format text """ +/srv/vm/bricklin.img.chroot apt installed linux-image-s390x ... done +/srv/vm/bricklin.img.chroot cache cleaned ... ok +creating /srv/vm/bricklin.img of size 1.02 gigabytes +Reading package lists... +Building dependency tree... +Reading state information... +The following packages were automatically installed and are no longer required: +[snip] +Use 'apt autoremove' to remove them. +The following NEW packages will be installed: + kpartx +0 upgraded, 1 newly installed, 0 to remove and 5 not upgraded. +Need to get 33.8 kB of archives. +After this operation, 76.8 kB of additional disk space will be used. +Get:1 http://deb.debian.org/debian stretch/main amd64 kpartx amd64 0.6.4-5 [33.8 kB] +Fetched 33.8 kB in 0s (118 kB/s) + Selecting previously unselected package kpartx. +(Reading database ... 238863 files and directories currently installed.) +Preparing to unpack .../kpartx_0.6.4-5_amd64.deb ... +Unpacking kpartx (0.6.4-5) ... +Setting up kpartx (0.6.4-5) ... +Processing triggers for man-db (2.7.6.1-2) ... +Setting up swapspace version 1, size = 248 MiB (260042752 bytes) +no label, UUID=65c5b131-98bf-4b8c-afad-9c75405c6391 +loop deleted : /dev/loop0 + 433,093,140 99% 220.62MB/s 0:00:01 (xfr#11289, to-chk=0/14615) +** warning: image is not bootable: no bootloader is installed +loop deleted : /dev/loop0 +concave.cs.unb.ca built disk image /srv/vm/bricklin.img ... failed +concave.cs.unb.ca s390x server image (bricklin) ... failed +concave.cs.unb.ca overall ... failed +"""]] + + -- cgit v1.2.3 From b374cf151c6181ffe7341df73f5a5eb3833ab7d8 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 8 Oct 2018 12:43:42 +0000 Subject: Added a comment: Initial attempt --- ...ent_1_4c4a376db9071336011abbf2993022f2._comment | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment diff --git a/doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment b/doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment new file mode 100644 index 00000000..60cbc9f0 --- /dev/null +++ b/doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment @@ -0,0 +1,68 @@ +[[!comment format=mdwn + username="david" + avatar="http://cdn.libravatar.org/avatar/22c2d800db6a7699139df604a67cb221" + subject="Initial attempt" + date="2018-10-08T12:43:42Z" + content=""" +I tried to solve this in the stupidest possible way. I'll paste diff here, as it's small and I'm not really confident it's ready for merging. + + +[[!format \"\"\" +diff --git a/src/Propellor/Property/DirectBoot.hs b/src/Propellor/Property/DirectBoot.hs +new file mode 100644 +index 00000000..4807471e +--- /dev/null ++++ b/src/Propellor/Property/DirectBoot.hs +@@ -0,0 +1,7 @@ ++module Propellor.Property.DirectBoot(installed) where ++ ++import Propellor.Base ++import Propellor.Types.Bootloader ++ ++installed :: Property (HasInfo + UnixLike) ++installed = pureInfoProperty \"direct boot\" [DirectBoot] +diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs +index 289de151..a41af18c 100644 +--- a/src/Propellor/Property/DiskImage.hs ++++ b/src/Propellor/Property/DiskImage.hs +@@ -228,6 +228,7 @@ imageBuilt' rebuild img mkchroot tabletype partspec = + ubootFlashKernelFinalized p + [FlashKernelInstalled, UbootInstalled p] -> + ubootFlashKernelFinalized p ++ [DirectBoot] -> directBootFinalized + _ -> unbootable \"multiple bootloaders are installed; don't know which to use\" + + -- | This property is automatically added to the chroot when building a +@@ -469,6 +470,9 @@ grubFinalized grubtarget _img mnt loopdevs = + ubootFinalized :: (FilePath -> FilePath -> Property Linux) -> Finalization + ubootFinalized p (RawDiskImage img) mnt _loopdevs = p img mnt + ++directBootFinalized :: Finalization ++directBootFinalized _img _mnt _loopDevs = doNothing ++ + flashKernelFinalized :: Finalization + flashKernelFinalized _img mnt _loopdevs = FlashKernel.flashKernelMounted mnt + +diff --git a/src/Propellor/Types/Bootloader.hs b/src/Propellor/Types/Bootloader.hs +index 65117bd2..cdb37a31 100644 +--- a/src/Propellor/Types/Bootloader.hs ++++ b/src/Propellor/Types/Bootloader.hs +@@ -10,6 +10,7 @@ data BootloaderInstalled + = GrubInstalled GrubTarget + | FlashKernelInstalled + | UbootInstalled (FilePath -> FilePath -> Property Linux) ++ | DirectBoot + deriving (Typeable) + + -- | Platforms that grub can boot. +@@ -19,6 +20,7 @@ instance Show BootloaderInstalled where + show (GrubInstalled _) = \"GrubInstalled\" + show FlashKernelInstalled = \"FlashKernelInstalled\" + show (UbootInstalled _) = \"UbootInstalled\" ++ show DirectBoot = \"DirectBoot\" + + instance IsInfo [BootloaderInstalled] where + propagateInfo _ = PropagateInfo False + +\"\"\"]] +"""]] -- cgit v1.2.3 From b5fd0fd2b224216222cb4a00642a21e1b5256269 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 8 Oct 2018 12:46:13 +0000 Subject: removed --- ...ent_1_4c4a376db9071336011abbf2993022f2._comment | 68 ---------------------- 1 file changed, 68 deletions(-) delete mode 100644 doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment diff --git a/doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment b/doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment deleted file mode 100644 index 60cbc9f0..00000000 --- a/doc/forum/support_for_non-bootable_disk_images/comment_1_4c4a376db9071336011abbf2993022f2._comment +++ /dev/null @@ -1,68 +0,0 @@ -[[!comment format=mdwn - username="david" - avatar="http://cdn.libravatar.org/avatar/22c2d800db6a7699139df604a67cb221" - subject="Initial attempt" - date="2018-10-08T12:43:42Z" - content=""" -I tried to solve this in the stupidest possible way. I'll paste diff here, as it's small and I'm not really confident it's ready for merging. - - -[[!format \"\"\" -diff --git a/src/Propellor/Property/DirectBoot.hs b/src/Propellor/Property/DirectBoot.hs -new file mode 100644 -index 00000000..4807471e ---- /dev/null -+++ b/src/Propellor/Property/DirectBoot.hs -@@ -0,0 +1,7 @@ -+module Propellor.Property.DirectBoot(installed) where -+ -+import Propellor.Base -+import Propellor.Types.Bootloader -+ -+installed :: Property (HasInfo + UnixLike) -+installed = pureInfoProperty \"direct boot\" [DirectBoot] -diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs -index 289de151..a41af18c 100644 ---- a/src/Propellor/Property/DiskImage.hs -+++ b/src/Propellor/Property/DiskImage.hs -@@ -228,6 +228,7 @@ imageBuilt' rebuild img mkchroot tabletype partspec = - ubootFlashKernelFinalized p - [FlashKernelInstalled, UbootInstalled p] -> - ubootFlashKernelFinalized p -+ [DirectBoot] -> directBootFinalized - _ -> unbootable \"multiple bootloaders are installed; don't know which to use\" - - -- | This property is automatically added to the chroot when building a -@@ -469,6 +470,9 @@ grubFinalized grubtarget _img mnt loopdevs = - ubootFinalized :: (FilePath -> FilePath -> Property Linux) -> Finalization - ubootFinalized p (RawDiskImage img) mnt _loopdevs = p img mnt - -+directBootFinalized :: Finalization -+directBootFinalized _img _mnt _loopDevs = doNothing -+ - flashKernelFinalized :: Finalization - flashKernelFinalized _img mnt _loopdevs = FlashKernel.flashKernelMounted mnt - -diff --git a/src/Propellor/Types/Bootloader.hs b/src/Propellor/Types/Bootloader.hs -index 65117bd2..cdb37a31 100644 ---- a/src/Propellor/Types/Bootloader.hs -+++ b/src/Propellor/Types/Bootloader.hs -@@ -10,6 +10,7 @@ data BootloaderInstalled - = GrubInstalled GrubTarget - | FlashKernelInstalled - | UbootInstalled (FilePath -> FilePath -> Property Linux) -+ | DirectBoot - deriving (Typeable) - - -- | Platforms that grub can boot. -@@ -19,6 +20,7 @@ instance Show BootloaderInstalled where - show (GrubInstalled _) = \"GrubInstalled\" - show FlashKernelInstalled = \"FlashKernelInstalled\" - show (UbootInstalled _) = \"UbootInstalled\" -+ show DirectBoot = \"DirectBoot\" - - instance IsInfo [BootloaderInstalled] where - propagateInfo _ = PropagateInfo False - -\"\"\"]] -"""]] -- cgit v1.2.3 From 47b6df5b9dc5391e2dd1dd17e72559a798c0cdce Mon Sep 17 00:00:00 2001 From: david Date: Mon, 8 Oct 2018 12:48:38 +0000 Subject: Added a comment: Initial attempt at a patch --- ...ent_1_94727e8ddf14f868225b99c83fbf406d._comment | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 doc/forum/support_for_non-bootable_disk_images/comment_1_94727e8ddf14f868225b99c83fbf406d._comment diff --git a/doc/forum/support_for_non-bootable_disk_images/comment_1_94727e8ddf14f868225b99c83fbf406d._comment b/doc/forum/support_for_non-bootable_disk_images/comment_1_94727e8ddf14f868225b99c83fbf406d._comment new file mode 100644 index 00000000..b4ade339 --- /dev/null +++ b/doc/forum/support_for_non-bootable_disk_images/comment_1_94727e8ddf14f868225b99c83fbf406d._comment @@ -0,0 +1,65 @@ +[[!comment format=mdwn + username="david" + avatar="http://cdn.libravatar.org/avatar/22c2d800db6a7699139df604a67cb221" + subject="Initial attempt at a patch" + date="2018-10-08T12:48:38Z" + content=""" +Here is a simple approach, that at least allows the image building to complete. I also managed to boot one of the images on AMD64. Probably it needs more testing, and I'm sure there are style and naming issues. +[[!format text \"\"\" +diff --git a/src/Propellor/Property/DirectBoot.hs b/src/Propellor/Property/DirectBoot.hs +new file mode 100644 +index 00000000..4807471e +--- /dev/null ++++ b/src/Propellor/Property/DirectBoot.hs +@@ -0,0 +1,7 @@ ++module Propellor.Property.DirectBoot(installed) where ++ ++import Propellor.Base ++import Propellor.Types.Bootloader ++ ++installed :: Property (HasInfo + UnixLike) ++installed = pureInfoProperty \"direct boot\" [DirectBoot] +diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs +index 289de151..a41af18c 100644 +--- a/src/Propellor/Property/DiskImage.hs ++++ b/src/Propellor/Property/DiskImage.hs +@@ -228,6 +228,7 @@ imageBuilt' rebuild img mkchroot tabletype partspec = + ubootFlashKernelFinalized p + [FlashKernelInstalled, UbootInstalled p] -> + ubootFlashKernelFinalized p ++ [DirectBoot] -> directBootFinalized + _ -> unbootable \"multiple bootloaders are installed; don't know which to use\" + + -- | This property is automatically added to the chroot when building a +@@ -469,6 +470,9 @@ grubFinalized grubtarget _img mnt loopdevs = + ubootFinalized :: (FilePath -> FilePath -> Property Linux) -> Finalization + ubootFinalized p (RawDiskImage img) mnt _loopdevs = p img mnt + ++directBootFinalized :: Finalization ++directBootFinalized _img _mnt _loopDevs = doNothing ++ + flashKernelFinalized :: Finalization + flashKernelFinalized _img mnt _loopdevs = FlashKernel.flashKernelMounted mnt + +diff --git a/src/Propellor/Types/Bootloader.hs b/src/Propellor/Types/Bootloader.hs +index 65117bd2..cdb37a31 100644 +--- a/src/Propellor/Types/Bootloader.hs ++++ b/src/Propellor/Types/Bootloader.hs +@@ -10,6 +10,7 @@ data BootloaderInstalled + = GrubInstalled GrubTarget + | FlashKernelInstalled + | UbootInstalled (FilePath -> FilePath -> Property Linux) ++ | DirectBoot + deriving (Typeable) + + -- | Platforms that grub can boot. +@@ -19,6 +20,7 @@ instance Show BootloaderInstalled where + show (GrubInstalled _) = \"GrubInstalled\" + show FlashKernelInstalled = \"FlashKernelInstalled\" + show (UbootInstalled _) = \"UbootInstalled\" ++ show DirectBoot = \"DirectBoot\" + + instance IsInfo [BootloaderInstalled] where + propagateInfo _ = PropagateInfo False +\"\"\"]] +"""]] -- cgit v1.2.3 From 4dde7dd7d3805a10839f7f4b8dd4c9fc842ae49e Mon Sep 17 00:00:00 2001 From: david Date: Mon, 8 Oct 2018 13:03:06 +0000 Subject: Added a comment: As commits --- .../comment_2_cced7ce2491cf440ee1d576b75ab4539._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/support_for_non-bootable_disk_images/comment_2_cced7ce2491cf440ee1d576b75ab4539._comment diff --git a/doc/forum/support_for_non-bootable_disk_images/comment_2_cced7ce2491cf440ee1d576b75ab4539._comment b/doc/forum/support_for_non-bootable_disk_images/comment_2_cced7ce2491cf440ee1d576b75ab4539._comment new file mode 100644 index 00000000..51cad6ff --- /dev/null +++ b/doc/forum/support_for_non-bootable_disk_images/comment_2_cced7ce2491cf440ee1d576b75ab4539._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="david" + avatar="http://cdn.libravatar.org/avatar/22c2d800db6a7699139df604a67cb221" + subject="As commits" + date="2018-10-08T13:03:06Z" + content=""" +I pushed the changes to + +https://salsa.debian.org/bremner/propellor/commits/proposed/direct-boot +"""]] -- cgit v1.2.3 From d1d59f15ce61924a8910c7932c8a646676105962 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 13 Oct 2018 14:18:33 +0000 Subject: --- doc/forum/__35__propellor_on_irc.oftc.net.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/forum/__35__propellor_on_irc.oftc.net.mdwn diff --git a/doc/forum/__35__propellor_on_irc.oftc.net.mdwn b/doc/forum/__35__propellor_on_irc.oftc.net.mdwn new file mode 100644 index 00000000..9f644611 --- /dev/null +++ b/doc/forum/__35__propellor_on_irc.oftc.net.mdwn @@ -0,0 +1,2 @@ +This might be wildly optimistic, but I registered the IRC channel #propellor on irc.oftc.net. I have no strong opinions on irc networks, but #git-annex is already there. Please join so you can answer my questions ;). + -- cgit v1.2.3