| 23 Feb 2023 |
 @elvishjerricco:matrix.org | I doubt that's necessary. After all, it should be just one line either way. enableInteractive vs extraBin.bash | 18:17:44 |
 @lily:lily.flowers | Fair | 18:17:54 |
| @elvishjerricco:matrix.org | unless there's more to getting tab completion | 18:17:58 |
| @lily:lily.flowers | There is not, I can confirm | 18:24:45 |
| @lily:lily.flowers | Just boot.initrd.systemd.extraBin = { sh = "${pkgs.bashInteractive}/bin/sh"; }; | 18:25:04 |
| @elvishjerricco:matrix.org | nice | 18:25:12 |
| 28 Feb 2023 |
| @lily:lily.flowers | In reply to @kranzes:matrix.org
https://github.com/NixOS/nixpkgs/pull/217728 Okay, it took me a while to get back to it, but I got plymouth working. You removed the stuff that was fixing up the compiled-in runtime dirs when converting to Meson so it really just required one quick thing for that and I removed a few other unnecessary things. I'll make a proper review in a bit for you with the fixes | 23:56:06 |
| 1 Mar 2023 |
 @kranzes:matrix.org | Great | 00:11:53 |
| @kranzes:matrix.org | Are the unnecessary things other meson flags? | 00:12:19 |
| @kranzes:matrix.org | I thought it'd be better to enable everything like it was before | 00:12:42 |
| @kranzes:matrix.org | Instead of relying on the default/auto options | 00:12:53 |
| @lily:lily.flowers | Here's the diff I'm currently testing:
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index f2abfa68682..42ba23901e0 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
pname = "plymouth";
version = "unstable-2023-02-22";
+ outputs = [ "out" "dev" ];
+
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
@@ -30,7 +32,6 @@ stdenv.mkDerivation rec {
};
patches = [
- ./add-option-for-installation-sysconfdir.patch
./dont-create-broken-symlink.patch
];
@@ -55,7 +56,6 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "--sysconfdir=/etc"
"-Dlogo=/etc/plymouth/logo.png"
"-Dbackground-color=0x000000"
"-Dbackground-start-color-stop=0x000000"
@@ -74,6 +74,10 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace meson.build \
+ --replace "'PLYMOUTH_THEME_PATH', plymouth_theme_path" "'PLYMOUTH_THEME_PATH', '/etc/plymouth/themes'" \
+ --replace "'PLYMOUTH_PLUGIN_PATH', plymouth_plugin_path" "'PLYMOUTH_PLUGIN_PATH', '/etc/plymouth/plugins/'" \
+ --replace "'PLYMOUTH_POLICY_DIR', plymouth_policy_dir" "'PLYMOUTH_POLICY_DIR', '/etc/plymouth/'" \
+ --replace "'PLYMOUTH_CONF_DIR', plymouth_conf_dir" "'PLYMOUTH_CONF_DIR', '/etc/plymouth/'" \
--replace "run_command(['scripts/generate-version.sh'], check: true).stdout().strip()" "'${version}'"
sed -i '/^install_emptydir/d' src/meson.build
| 00:13:17 |
| @lily:lily.flowers | I left most of the meson flags as default | 00:13:33 |
| @lily:lily.flowers | I'm double checking that flicker-free boot in a VM works seamlessly like before just to be sure there are no regressions from the update | 00:14:42 |
| @lily:lily.flowers | In reply to @kranzes:matrix.org
Are the unnecessary things other meson flags? (so to clarify, unnecessary things were the sysconf related patch and flag, since it does the right thing by default and has similar semantics to the autoconf script -- which means we still need to manually patch the compiled-in definitions like the autoconf scripts though, it seems) | 00:16:41 |
| @kranzes:matrix.org | Can't view diff on mobile oof | 00:18:25 |
| @kranzes:matrix.org | Anyway I'm going to bed now, i need to be at school in 6 hours 😬 | 00:19:12 |
| @kranzes:matrix.org | I'll check your suggestions tomorrow | 00:19:26 |
| @lily:lily.flowers | Sounds good, rest well! | 00:19:33 |
| @kranzes:matrix.org | Yeah im really gonna enjoy these 4 or 5 hours haha 🙃 | 00:20:01 |
| @kranzes:matrix.org | * Yeah im really gonna enjoy these 4 or 5 hours of sleep haha 🙃 | 00:20:18 |
| 2 Mar 2023 |
|  @maxeaubrey:matrix.org changed their display name from maxine (they/them) to maxine. | 00:58:05 |
| 6 Mar 2023 |
| @elvishjerricco:matrix.org | alright back to the networkd branch... | 18:57:27 |
| @elvishjerricco:matrix.org | That's interesting... I see output from the openvpn command before I see systemd[1]: Starting openvpn.service... | 19:06:07 |
| @lily:lily.flowers | In reply to @elvishjerricco:matrix.org
That's interesting... I see output from the openvpn command before I see systemd[1]: Starting openvpn.service... Is that in a NixOS test? I've noticed it too before in those and wondered if it had to do with the buffering the serial console grabber has (and it maybe interacting poorly with journald) | 19:14:41 |
| @elvishjerricco:matrix.org | yea it's a nixos test | 19:15:02 |
| @elvishjerricco:matrix.org | that could be the case | 19:15:15 |
| @elvishjerricco:matrix.org | this is all very nearly simultaneous | 19:15:22 |
| @elvishjerricco:matrix.org | Well, it appears I've got openvpn started and the ip address is set, but the server can't ping it.. | 20:21:31 |
| @elvishjerricco:matrix.org | * Well, it appears I've got openvpn started and the ip address is set, but the server can't ping it | 20:21:34 |
