linux-lin | Mirror of http

You can use Grub Customizer to set the default boot entry. Install Grub Customizer by running

I faced a similar problem.
Try committing your container.
Then run it again.
e.g.
docker commit RUNNING_CONTAINER IMAGE1
docker run -d IMAGE1

Git stores, in the index, some special bits of information to know easily whether a file in the work-tree is modified or not. The index itself is a file that resides within the Git repository (.git/index; there may be additional auxiliary files, and temporary index files, here, but .git/index is the index, the first and real-est, as it were).

These special bits of information in the index are (derived from) the result of operating system stat calls. The stat calls on Linux and the stat calls on Windows deliver different data (specifically st_dev, though the ino, uid, and gid can also be an issue), so a single index (and hence Git repository-and-work-tree) cannot¹ be correctly shared across a machine boundary. This holds for network drives, VM images, Dropbox folders (which have other issues), or any other sharing mechanism that allows either system to directly view the other system's data.

The end result of all of this is that it's sometimes, just barely, possible to share a Git repository this way, but it's a bad idea: you'll get odd effects, such as Git missing some modified files, or thinking files are modified when they aren't. The latter is what you're seeing, probably.

It really works a lot better, though, not to share repository directories (nor work-trees) like this. That's even true on "friendlier" systems, such as MacOS vs Linux when using VMs and, e.g., vagrant. It sort of works, sometimes, but it just is not reliable. Use separate clones and your life will be happier.

¹At compile time, one can choose to have Git ignore the st_dev field, to enable sharing across network drives. That sometimes makes a difference, and sometimes doesn't. I suspect this option is chosen in most Windows builds so that Windows can share with Windows, but is not enabled in Linux builds, which means the Linux side won't ignore changes made by the Windows side—which will result in odd behavior.

The timestamps are normally compatible, but if one enables nanosecond-resolution time stamps, that may also be problematic.

So, your timeline, as confirmed in comments, with what was happening:

1) checked out files on Unix. The file has Unix line endings (LF).

2) copied to Windows. The file still has Unix line endings.

3) ran through Java file to change some values. As you read the file, you try to strip CR from it, even though it doesn't contain CR in the first place (only LF); but even if it did contain CR, it wouldn't work because you get the string without line endings, as per BufferedReader.readLine documentation. You write lines to the new file with \n; Java understands \n as "end of line terminator", which makes the Java-on-Windows write the Windows line endings (CR LF) on each line written (in both branches of the if - i.e. both on changed lines and those that you just intend to copy without change). The file now contains Windows (CR LF) endings on all its lines.

4) copied the transformed file back to Unix. The line endings are Windows (CR LF).

5) committed the file. Since you committed the file on Linux, I assume git was not set up to strip them during commit. Thus, the file got committed with each line changed: some lines substantially, but some lines trivially (with just the change of the line terminator).

Now you are in a situation where if you try to get the Unix line terminators back, you are effectively changing the whole file - because every line needs to be changed, even just a little.

Other options:

If you have already pushed the changes, the obvious way would be to git revert this commit (which will also look like changing the entire file, but at least it's kind of clear it's a revert), then either rerun the Java program on the Unix machine, or do dos2unix file after copying back to Unix machine but before committing.

If you have not pushed the changes, you can get away with git reset --hard HEAD^ instead of reverting.

Since it is hard to determine which column the string belongs to, I make the following assumption:

• The columns are perfectly aligned and space separated

so the following awk script will assume:

• A line that does not start with a date will be merged into the next line
• The width of the columns will be determined by the column-width of next line

note: if your file is aligned with blanks (a combination of tabs and spaces), we cannot make use of the field separator "\t" to distinguish fields as the number of tabs will depend on the field width.

Here is the tested script:

You can try this. Note that what you actually want is to remove \", not "\ (as proposed in the unedited version of your question). The first " you need to represent each element in the character.

There is some documentation in the following link that you can follow to resize the file system and partitions on a persistent disk on a Cloud VM instance.

https://cloud.google.com/compute/docs/disks/add-persistent-disk#resize_partitions