[Stable Update] 2024-02-21 - Kernels, KDE, VirtualBox, Calamares, ROCm, Firefox, Thunderbird

Read my post in that thread. Merging with meld doesn’t work as expected for that particular .pacnew, you need to edit the line manually.

You only can’t use the arrow icon (feature) in Meld but Meld merging still should work when you manually copy+paste the first mentionend line.

At the end of the day, this called merging.

That’s obvious to you and me and any experienced user, but I suspect that it’s not to a lot of people here.

Don’t get me wrong, i think this special .pacnew file merging is a little bid confusing for some users.

But when you tell people that:“Merging with meld doesn’t work as expected”
its also confusing for the unexperienced users.

What do you think, what they would think after this statement?

I guess, they would think:

okay… Meld don’t work and i need another program to edit this file now.

I just point to the final problem, without a hidden message:
Don’t use this arrow icon feature for this particular pacnew file… and copy+overwrite just the first lane, thats it… problem solved.

Could some-one kindly explain what manjaro-bash is, or was?
I never heard of it until now.

EDIT: I guess you mean bashrc-manjaro mentioned in the wiki-post.
(I read it a week ago and didn’t remember the exact word.)

Is there a typo in the wiki-post? I get:

# ll /etc/.bash*
ls: cannot access '/etc/.bash*': No such file or directory

# ll /etc/bash*
-rw-r--r-- 1 root root 1153 231115_154254.564 /etc/bash.bashrc
-rw-r--r-- 1 root root   28 231124_012418.000 /etc/bash.bash_logout

A post was split to a new topic: Network regression for mt7922 wifi adapter after update

No /etc/bash.bashrc.pacsave on 2 Xfce systems (testing + stable branches)

check in /etc/skel for .bashrc

There’s that typo I was referring to.
I think you need to remove the first dot.
It should be /etc/bash.bashrc
and /etc/bash.bashrc.pacsave

Dear all,
Same here , like others (AdamJenson), I had a sound issue on my Manjaro, after the update.
I was able to “fix” it , by opening pavucontrol and changing the settings (Configuration tab + Output Devices). But it is not perfect (as before the update): because I need to choose between the config for headphones or the config for speakers: Meaning I cannot easily switch from one to another.
From what I can see , this update has impacted my sink & port.

More details below where there is a diff between speakers & headphones configuration

speakers working

$ pactl get-default-sink
alsa_output.usb-Generic_USB_Audio_200901010001-00.HiFi__Line__sink

and:

$ pactl list short sinks
10	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI3__sink	module-alsa-card.c	s16le 2ch 48000Hz	IDLE
11	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI2__sink	module-alsa-card.c	s16le 2ch 48000Hz	IDLE
12	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI1__sink	module-alsa-card.c	s16le 2ch 48000Hz	IDLE
14	alsa_output.usb-Generic_USB_Audio_200901010001-00.HiFi__Line__sink	module-alsa-card.c	s24le 2ch 48000Hz	IDLE
15	alsa_output.usb-Generic_USB_Audio_200901010001-00.HiFi__Headphones__sink	module-alsa-card.c	s24le 2ch 48000Hz	IDLE
16	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__Speaker__sink	module-alsa-card.c	s16le 2ch 48000Hz	RUNNING

headphones working

$ pactl get-default-sink
alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__Headphones__sink

and:

$ pactl list short sinks
10	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI3__sink	module-alsa-card.c	s16le 2ch 48000Hz	IDLE
11	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI2__sink	module-alsa-card.c	s16le 2ch 48000Hz	IDLE
12	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__HDMI1__sink	module-alsa-card.c	s16le 2ch 48000Hz	IDLE
14	alsa_output.usb-Generic_USB_Audio_200901010001-00.HiFi__Line__sink	module-alsa-card.c	s24le 2ch 48000Hz	IDLE
15	alsa_output.usb-Generic_USB_Audio_200901010001-00.HiFi__Headphones__sink	module-alsa-card.c	s24le 2ch 48000Hz	IDLE
17	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__Headphones__sink	module-alsa-card.c	s16le 2ch 48000Hz	RUNNING

So , I am happy to hear thoughts / suggestions, on how I can improve my configuration.

1 Like

Far more likely reason for ~/.profile not being loaded if you’re an Xfce user is this change to LightDM. Previously it was loading ~/.profile and other files

for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
    if [ -f "$file" ]; then
        echo "Loading profile from $file";
        . "$file"
    fi
done

Now it doesn’t do that, and neither bash or zsh will load ~/.profile by default (bash will load it only if there is no ~/.bash_profile or ~/.bash_login, or if it’s launched with name sh or with --posix option).

Bash starup files

Zsh startup files

So yes, if you were relying on previous LightDM behaviour and still need ~/.profile to be sourced then you now have to do that from either ~/.bash_profile or ~/.zprofile as appropriate for your chosen shell.

4 Likes

Hello.
Using pacdiff -s, that’s the result on “view” mode:

Do I need to just change the first line to root:x:0:0::/root:/usr/bin/bash?
And after that, delete /etc/passwd.pacnew?

I am following this answer:

Right now I think that I am understanding what is going on… Hope that solving this pacnew stuff, this strange buggy thing on my system stops…

Thanks for that info! As Cinnamon also uses LightDM, this explains a lot…

This Editor doesn’t look like Meld btw.

Yeah, you can change it like that…

Since you got a snapshot from this pacnew file you can easy delete it.

If you have also merged other and older pacnew files, you may could fix your bug… its only a possibility.

But not from this brand new .pacnew file… both config files are fine “at the moment”… but we merge it for the future, if/when a developer rely on this newer settings at some day or not… nobody knows.

Thats why this changes right now are only optional… you can’t know what happends and how much it depends at a certain time, to have this settings updated.

You just fixing possible bugs that maybe will show up in future… minority report style, don’t get arrested by Tom Cruise :male_detective: :crazy_face:

Yeah, I just type pacdiff -s. You already sent the instructions to use meld, right?
Do I need to use that, or doing that manually on the file it’s ok?

Right… If I remember correctly, I don’t have any other pacnew files…
I suspect that this bug it’s something on Xorg or Gnome itself. Because already on the login screen I feel the delay on some things (like press enter to start typing the password on login screen. In system, pause a song have the same problem).

Yeah, both option are posted above.

Someone told me a year ago, that Meld doing a better job to keep the file rights/access present after Merging. You need to do it manually, always. The question is only, in which viewer/editor you gonna do it.

Its not meld thats better at permissions.
Its pacdiff -s, whatever the editor of choice.
As it creates temporary directory, and uses sudoedit, meaning acts on temporary files and then uses sudo afterwards to apply changes.
meld is regarded well for being a GUI that supports in-line merging and editing.
(tools like kdiff3 only allow full replacements, vimdiff is unwieldy, etc)
But the point is to use pacdiff which is the tool for finding the offending pacnew/pacsave/etc’s, as well as the appropriate tools and formulated functions for editing and preserving files. (skip, save, backup, view, sudoedit as mentioned, etc)

A snippet for the extra curious:

Summary
diffprog_fn() {
        if [[ -n "$SUDO" ]]; then
                SUDO_EDITOR="$diffprog" sudoedit "$@"
        else
                $diffprog "$@"
        fi
}

view_diff() {
        pacfile="$1"
        file="$2"

        package="$(pacman -Qoq "$file")" || return 1
        base_tar="$(base_cache_tar "$package")"

        two_way_diff() {
                diffprog_fn "$pacfile" "$file"
        }

        three_way_diff() {
                diffprog_fn "$pacfile" "$base" "$file"
        }

        unset tempdir

        if (( ! THREE_WAY_DIFF )); then
                two_way_diff
        elif [[ -z $base_tar ]]; then
                msg2 "Unable to find a base package. falling back to 2-way diff."
                two_way_diff
        else
                basename="$(basename "$file")"
                tempdir="$(mktemp -d --tmpdir "pacdiff-diff-$basename.XXX")"
                base="$(mktemp "$tempdir"/"$basename.base.XXX")"
                merged="$(mktemp "$tempdir"/"$basename.merged.XXX")"

                if ! bsdtar -xqOf "$base_tar" "${file#/}" >"$base"; then
                        msg2 "Unable to extract the previous version of this file. falling back to 2-way diff."
                        two_way_diff
                else
                        three_way_diff
                fi
        fi

        ret=1

        if cmp -s "$pacfile" "$file"; then
                msg2 "Files are identical, removing..."
                $SUDO rm -v "$pacfile"
                ret=0
        fi

        $SUDO rm -rf "$tempdir"
        return $ret
}
1 Like

Nice catch bro, thank you

2 posts were split to a new topic: Node related file conflicts

Hello
Just “merged” here. Everything was fine.
But, I ran pacdiff -s again and it show a new .pacnew file.


Should I merge (manually)?

1 Like